Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ad24ea4 authored by Wilfried Klaebe's avatar Wilfried Klaebe Committed by David S. Miller
Browse files

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: default avatarDave Miller <davem@davemloft.net>
Signed-off-by: default avatarWilfried Klaebe <w-lkml@lebenslange-mailadresse.de>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0f49ff07

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -105,5 +105,5 @@ static const struct ethtool_ops ipoib_ethtool_ops = { 


void ipoib_set_ethtool_ops(struct net_device *dev)

{

	SET_ETHTOOL_OPS(dev, &ipoib_ethtool_ops);

	dev->ethtool_ops = &ipoib_ethtool_ops;

}

drivers/net/ethernet/3com/3c509.c

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ static int el3_common_init(struct net_device *dev) 
	/* The EL3-specific entries in the device structure. */

	dev->netdev_ops = &netdev_ops;

	dev->watchdog_timeo = TX_TIMEOUT;

	SET_ETHTOOL_OPS(dev, &ethtool_ops);

	dev->ethtool_ops = &ethtool_ops;



	err = register_netdev(dev);

	if (err) {

drivers/net/ethernet/3com/3c589_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int tc589_probe(struct pcmcia_device *link) 
	dev->netdev_ops = &el3_netdev_ops;

	dev->watchdog_timeo = TX_TIMEOUT;



	SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);

	dev->ethtool_ops = &netdev_ethtool_ops;



	return tc589_config(link);

}

drivers/net/ethernet/3com/typhoon.c

+1 −1
Original line number Diff line number Diff line
@@ -2435,7 +2435,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	netif_napi_add(dev, &tp->napi, typhoon_poll, 16);

	dev->watchdog_timeo	= TX_TIMEOUT;



	SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops);

	dev->ethtool_ops = &typhoon_ethtool_ops;



	/* We can handle scatter gather, up to 16 entries, and

	 * we can do IP checksumming (only version 4, doh...)

drivers/net/ethernet/adaptec/starfire.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ static int starfire_init_one(struct pci_dev *pdev, 


	dev->netdev_ops = &netdev_ops;

	dev->watchdog_timeo = TX_TIMEOUT;

	SET_ETHTOOL_OPS(dev, &ethtool_ops);

	dev->ethtool_ops = &ethtool_ops;



	netif_napi_add(dev, &np->napi, netdev_poll, max_interrupt_work);