Re: [PATCH] ARM: DaVinci: EMAC: Convert to net_device_ops

2009-04-17 Thread Kevin Hilman
Chaithrika U S  writes:

> Use network device ops interface.
> Tested on TI DM646x adn DM644x EVMs.
>
> Signed-off-by: Chaithrika U S 

Thanks, pushing today.

Kevin

> ---
>  drivers/net/davinci_emac.c |   28 +++-
>  1 files changed, 15 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
> index 80b6e68..c53 100644
> --- a/drivers/net/davinci_emac.c
> +++ b/drivers/net/davinci_emac.c
> @@ -2606,6 +2606,19 @@ static struct net_device_stats 
> *emac_dev_getnetstats(struct net_device *ndev)
>   return &priv->net_dev_stats;
>  }
>  
> +static const struct net_device_ops emac_netdev_ops = {
> + .ndo_open   = emac_dev_open,
> + .ndo_stop   = emac_dev_stop,
> + .ndo_start_xmit = emac_dev_xmit,
> + .ndo_set_multicast_list = emac_dev_mcast_set,
> + .ndo_set_mac_address= emac_dev_setmac_addr,
> + .ndo_do_ioctl   = emac_devioctl,
> + .ndo_tx_timeout = emac_dev_tx_timeout,
> + .ndo_get_stats  = emac_dev_getnetstats,
> +#ifdef CONFIG_NET_POLL_CONTROLLER
> + .ndo_poll_controller= emac_poll_controller,
> +#endif
> +};
>  
>  /**
>   * davinci_emac_probe: EMAC device probe
> @@ -2708,20 +2721,9 @@ static int __devinit davinci_emac_probe(struct 
> platform_device *pdev)
>   printk(KERN_WARNING "%s: using random MAC addr: %s\n",
>   __func__, print_mac(buf, priv->mac_addr));
>   }
> - /* populate the device structure */
> - ndev->validate_addr = NULL;
> - ndev->open = emac_dev_open;   /*  i.e. start device  */
> - ndev->stop = emac_dev_stop;
> - ndev->do_ioctl = emac_devioctl;
> +
> + ndev->netdev_ops = &emac_netdev_ops;
>   SET_ETHTOOL_OPS(ndev, ðtool_ops);
> - ndev->get_stats = emac_dev_getnetstats;
> - ndev->set_multicast_list = emac_dev_mcast_set;
> - ndev->hard_start_xmit = emac_dev_xmit;
> - ndev->tx_timeout = emac_dev_tx_timeout;
> - ndev->set_mac_address = emac_dev_setmac_addr;
> -#ifdef CONFIG_NET_POLL_CONTROLLER
> - ndev->poll_controller = emac_poll_controller;
> -#endif
>   netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
>  
>   /* register the network device */
> -- 
> 1.5.6
>
> ___
> Davinci-linux-open-source mailing list
> Davinci-linux-open-source@linux.davincidsp.com
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source

___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source


[PATCH] ARM: DaVinci: EMAC: Convert to net_device_ops

2009-04-17 Thread Chaithrika U S
Use network device ops interface.
Tested on TI DM646x adn DM644x EVMs.

Signed-off-by: Chaithrika U S 
---
 drivers/net/davinci_emac.c |   28 +++-
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 80b6e68..c53 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -2606,6 +2606,19 @@ static struct net_device_stats 
*emac_dev_getnetstats(struct net_device *ndev)
return &priv->net_dev_stats;
 }
 
+static const struct net_device_ops emac_netdev_ops = {
+   .ndo_open   = emac_dev_open,
+   .ndo_stop   = emac_dev_stop,
+   .ndo_start_xmit = emac_dev_xmit,
+   .ndo_set_multicast_list = emac_dev_mcast_set,
+   .ndo_set_mac_address= emac_dev_setmac_addr,
+   .ndo_do_ioctl   = emac_devioctl,
+   .ndo_tx_timeout = emac_dev_tx_timeout,
+   .ndo_get_stats  = emac_dev_getnetstats,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+   .ndo_poll_controller= emac_poll_controller,
+#endif
+};
 
 /**
  * davinci_emac_probe: EMAC device probe
@@ -2708,20 +2721,9 @@ static int __devinit davinci_emac_probe(struct 
platform_device *pdev)
printk(KERN_WARNING "%s: using random MAC addr: %s\n",
__func__, print_mac(buf, priv->mac_addr));
}
-   /* populate the device structure */
-   ndev->validate_addr = NULL;
-   ndev->open = emac_dev_open;   /*  i.e. start device  */
-   ndev->stop = emac_dev_stop;
-   ndev->do_ioctl = emac_devioctl;
+
+   ndev->netdev_ops = &emac_netdev_ops;
SET_ETHTOOL_OPS(ndev, ðtool_ops);
-   ndev->get_stats = emac_dev_getnetstats;
-   ndev->set_multicast_list = emac_dev_mcast_set;
-   ndev->hard_start_xmit = emac_dev_xmit;
-   ndev->tx_timeout = emac_dev_tx_timeout;
-   ndev->set_mac_address = emac_dev_setmac_addr;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-   ndev->poll_controller = emac_poll_controller;
-#endif
netif_napi_add(ndev, &priv->napi, emac_poll, EMAC_POLL_WEIGHT);
 
/* register the network device */
-- 
1.5.6

___
Davinci-linux-open-source mailing list
Davinci-linux-open-source@linux.davincidsp.com
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source