diff options
author | Wilfried Klaebe <w-lkml@lebenslange-mailadresse.de> | 2014-05-10 20:12:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-13 17:43:20 -0400 |
commit | 7ad24ea4bf620a32631d7b3069c3e30c078b0c3e (patch) | |
tree | cdb3585122d2c7b99106edf4cbeebfd86c5aa7bf /drivers/net/ethernet/3com | |
parent | 0f49ff07025e8d6cd25bce5b623881739e04926e (diff) |
net: get rid of SET_ETHTOOL_OPS
net: get rid of SET_ETHTOOL_OPS
Dave Miller mentioned he'd like to see SET_ETHTOOL_OPS gone.
This does that.
Mostly done via coccinelle script:
@@
struct ethtool_ops *ops;
struct net_device *dev;
@@
- SET_ETHTOOL_OPS(dev, ops);
+ dev->ethtool_ops = ops;
Compile tested only, but I'd seriously wonder if this broke anything.
Suggested-by: Dave Miller <davem@davemloft.net>
Signed-off-by: Wilfried Klaebe <w-lkml@lebenslange-mailadresse.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/3com')
-rw-r--r-- | drivers/net/ethernet/3com/3c509.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/3com/3c589_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/3com/typhoon.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index 35df0b9e6848..a968654b631d 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c | |||
@@ -534,7 +534,7 @@ static int el3_common_init(struct net_device *dev) | |||
534 | /* The EL3-specific entries in the device structure. */ | 534 | /* The EL3-specific entries in the device structure. */ |
535 | dev->netdev_ops = &netdev_ops; | 535 | dev->netdev_ops = &netdev_ops; |
536 | dev->watchdog_timeo = TX_TIMEOUT; | 536 | dev->watchdog_timeo = TX_TIMEOUT; |
537 | SET_ETHTOOL_OPS(dev, ðtool_ops); | 537 | dev->ethtool_ops = ðtool_ops; |
538 | 538 | ||
539 | err = register_netdev(dev); | 539 | err = register_netdev(dev); |
540 | if (err) { | 540 | if (err) { |
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c index 063557e037f2..f18647c23559 100644 --- a/drivers/net/ethernet/3com/3c589_cs.c +++ b/drivers/net/ethernet/3com/3c589_cs.c | |||
@@ -218,7 +218,7 @@ static int tc589_probe(struct pcmcia_device *link) | |||
218 | dev->netdev_ops = &el3_netdev_ops; | 218 | dev->netdev_ops = &el3_netdev_ops; |
219 | dev->watchdog_timeo = TX_TIMEOUT; | 219 | dev->watchdog_timeo = TX_TIMEOUT; |
220 | 220 | ||
221 | SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops); | 221 | dev->ethtool_ops = &netdev_ethtool_ops; |
222 | 222 | ||
223 | return tc589_config(link); | 223 | return tc589_config(link); |
224 | } | 224 | } |
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index 465cc7108d8a..e13b04624ded 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c | |||
@@ -2435,7 +2435,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2435 | netif_napi_add(dev, &tp->napi, typhoon_poll, 16); | 2435 | netif_napi_add(dev, &tp->napi, typhoon_poll, 16); |
2436 | dev->watchdog_timeo = TX_TIMEOUT; | 2436 | dev->watchdog_timeo = TX_TIMEOUT; |
2437 | 2437 | ||
2438 | SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops); | 2438 | dev->ethtool_ops = &typhoon_ethtool_ops; |
2439 | 2439 | ||
2440 | /* We can handle scatter gather, up to 16 entries, and | 2440 | /* We can handle scatter gather, up to 16 entries, and |
2441 | * we can do IP checksumming (only version 4, doh...) | 2441 | * we can do IP checksumming (only version 4, doh...) |