Skip to content

Commit 7ad24ea

Browse files
Wilfried Klaebedavem330
Wilfried Klaebe
authored and
davem330
committed
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 <[email protected]> Signed-off-by: Wilfried Klaebe <[email protected]> Acked-by: Felipe Balbi <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0f49ff0 commit 7ad24ea

File tree

108 files changed

+118
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+118
-128
lines changed

‎drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,5 @@ static const struct ethtool_ops ipoib_ethtool_ops = {
105105

106106
void ipoib_set_ethtool_ops(struct net_device *dev)
107107
{
108-
SET_ETHTOOL_OPS(dev, &ipoib_ethtool_ops);
108+
dev->ethtool_ops = &ipoib_ethtool_ops;
109109
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ static int el3_common_init(struct net_device *dev)
534534
/* The EL3-specific entries in the device structure. */
535535
dev->netdev_ops = &netdev_ops;
536536
dev->watchdog_timeo = TX_TIMEOUT;
537-
SET_ETHTOOL_OPS(dev, &ethtool_ops);
537+
dev->ethtool_ops = &ethtool_ops;
538538

539539
err = register_netdev(dev);
540540
if (err) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int tc589_probe(struct pcmcia_device *link)
218218
dev->netdev_ops = &el3_netdev_ops;
219219
dev->watchdog_timeo = TX_TIMEOUT;
220220

221-
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
221+
dev->ethtool_ops = &netdev_ethtool_ops;
222222

223223
return tc589_config(link);
224224
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2435,7 +2435,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
24352435
netif_napi_add(dev, &tp->napi, typhoon_poll, 16);
24362436
dev->watchdog_timeo = TX_TIMEOUT;
24372437

2438-
SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops);
2438+
dev->ethtool_ops = &typhoon_ethtool_ops;
24392439

24402440
/* We can handle scatter gather, up to 16 entries, and
24412441
* we can do IP checksumming (only version 4, doh...)

‎drivers/net/ethernet/adaptec/starfire.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,7 @@ static int starfire_init_one(struct pci_dev *pdev,
784784

785785
dev->netdev_ops = &netdev_ops;
786786
dev->watchdog_timeo = TX_TIMEOUT;
787-
SET_ETHTOOL_OPS(dev, &ethtool_ops);
787+
dev->ethtool_ops = &ethtool_ops;
788788

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

‎drivers/net/ethernet/alteon/acenic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ static int acenic_probe_one(struct pci_dev *pdev,
476476
dev->watchdog_timeo = 5*HZ;
477477

478478
dev->netdev_ops = &ace_netdev_ops;
479-
SET_ETHTOOL_OPS(dev, &ace_ethtool_ops);
479+
dev->ethtool_ops = &ace_ethtool_ops;
480480

481481
/* we only display this string ONCE */
482482
if (!boards_found)

‎drivers/net/ethernet/altera/altera_tse_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,5 +237,5 @@ static const struct ethtool_ops tse_ethtool_ops = {
237237

238238
void altera_tse_set_ethtool_ops(struct net_device *netdev)
239239
{
240-
SET_ETHTOOL_OPS(netdev, &tse_ethtool_ops);
240+
netdev->ethtool_ops = &tse_ethtool_ops;
241241
}

‎drivers/net/ethernet/amd/amd8111e.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1900,7 +1900,7 @@ static int amd8111e_probe_one(struct pci_dev *pdev,
19001900

19011901
/* Initialize driver entry points */
19021902
dev->netdev_ops = &amd8111e_netdev_ops;
1903-
SET_ETHTOOL_OPS(dev, &ops);
1903+
dev->ethtool_ops = &ops;
19041904
dev->irq =pdev->irq;
19051905
dev->watchdog_timeo = AMD8111E_TX_TIMEOUT;
19061906
netif_napi_add(dev, &lp->napi, amd8111e_rx_poll, 32);

‎drivers/net/ethernet/amd/au1000_eth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1229,7 +1229,7 @@ static int au1000_probe(struct platform_device *pdev)
12291229
dev->base_addr = base->start;
12301230
dev->irq = irq;
12311231
dev->netdev_ops = &au1000_netdev_ops;
1232-
SET_ETHTOOL_OPS(dev, &au1000_ethtool_ops);
1232+
dev->ethtool_ops = &au1000_ethtool_ops;
12331233
dev->watchdog_timeo = ETH_TX_TIMEOUT;
12341234

12351235
/*

‎drivers/net/ethernet/amd/nmclan_cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ static int nmclan_probe(struct pcmcia_device *link)
457457
lp->tx_free_frames=AM2150_MAX_TX_FRAMES;
458458

459459
dev->netdev_ops = &mace_netdev_ops;
460-
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
460+
dev->ethtool_ops = &netdev_ethtool_ops;
461461
dev->watchdog_timeo = TX_TIMEOUT;
462462

463463
return nmclan_config(link);

‎drivers/net/ethernet/atheros/alx/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1302,7 +1302,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
13021302
}
13031303

13041304
netdev->netdev_ops = &alx_netdev_ops;
1305-
SET_ETHTOOL_OPS(netdev, &alx_ethtool_ops);
1305+
netdev->ethtool_ops = &alx_ethtool_ops;
13061306
netdev->irq = pdev->irq;
13071307
netdev->watchdog_timeo = ALX_WATCHDOG_TIME;
13081308

‎drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,5 +305,5 @@ static const struct ethtool_ops atl1c_ethtool_ops = {
305305

306306
void atl1c_set_ethtool_ops(struct net_device *netdev)
307307
{
308-
SET_ETHTOOL_OPS(netdev, &atl1c_ethtool_ops);
308+
netdev->ethtool_ops = &atl1c_ethtool_ops;
309309
}

‎drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,5 +388,5 @@ static const struct ethtool_ops atl1e_ethtool_ops = {
388388

389389
void atl1e_set_ethtool_ops(struct net_device *netdev)
390390
{
391-
SET_ETHTOOL_OPS(netdev, &atl1e_ethtool_ops);
391+
netdev->ethtool_ops = &atl1e_ethtool_ops;
392392
}

‎drivers/net/ethernet/atheros/atlx/atl2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1396,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
13961396
atl2_setup_pcicmd(pdev);
13971397

13981398
netdev->netdev_ops = &atl2_netdev_ops;
1399-
SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
1399+
netdev->ethtool_ops = &atl2_ethtool_ops;
14001400
netdev->watchdog_timeo = 5 * HZ;
14011401
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
14021402

‎drivers/net/ethernet/broadcom/b44.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2380,7 +2380,7 @@ static int b44_init_one(struct ssb_device *sdev,
23802380
netif_napi_add(dev, &bp->napi, b44_poll, 64);
23812381
dev->watchdog_timeo = B44_TX_TIMEOUT;
23822382
dev->irq = sdev->irq;
2383-
SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
2383+
dev->ethtool_ops = &b44_ethtool_ops;
23842384

23852385
err = ssb_bus_powerup(sdev->bus, 0);
23862386
if (err) {

‎drivers/net/ethernet/broadcom/bcm63xx_enet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,7 @@ static int bcm_enet_probe(struct platform_device *pdev)
18971897
dev->netdev_ops = &bcm_enet_ops;
18981898
netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16);
18991899

1900-
SET_ETHTOOL_OPS(dev, &bcm_enet_ethtool_ops);
1900+
dev->ethtool_ops = &bcm_enet_ethtool_ops;
19011901
SET_NETDEV_DEV(dev, &pdev->dev);
19021902

19031903
ret = register_netdev(dev);
@@ -2783,7 +2783,7 @@ static int bcm_enetsw_probe(struct platform_device *pdev)
27832783
/* register netdevice */
27842784
dev->netdev_ops = &bcm_enetsw_ops;
27852785
netif_napi_add(dev, &priv->napi, bcm_enet_poll, 16);
2786-
SET_ETHTOOL_OPS(dev, &bcm_enetsw_ethtool_ops);
2786+
dev->ethtool_ops = &bcm_enetsw_ethtool_ops;
27872787
SET_NETDEV_DEV(dev, &pdev->dev);
27882788

27892789
spin_lock_init(&priv->enetsw_mdio_lock);

‎drivers/net/ethernet/broadcom/bcmsysport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1540,7 +1540,7 @@ static int bcm_sysport_probe(struct platform_device *pdev)
15401540

15411541
SET_NETDEV_DEV(dev, &pdev->dev);
15421542
dev_set_drvdata(&pdev->dev, dev);
1543-
SET_ETHTOOL_OPS(dev, &bcm_sysport_ethtool_ops);
1543+
dev->ethtool_ops = &bcm_sysport_ethtool_ops;
15441544
dev->netdev_ops = &bcm_sysport_netdev_ops;
15451545
netif_napi_add(dev, &priv->napi, bcm_sysport_poll, 64);
15461546

‎drivers/net/ethernet/broadcom/bgmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1436,7 +1436,7 @@ static int bgmac_probe(struct bcma_device *core)
14361436
return -ENOMEM;
14371437
net_dev->netdev_ops = &bgmac_netdev_ops;
14381438
net_dev->irq = core->irq;
1439-
SET_ETHTOOL_OPS(net_dev, &bgmac_ethtool_ops);
1439+
net_dev->ethtool_ops = &bgmac_ethtool_ops;
14401440
bgmac = netdev_priv(net_dev);
14411441
bgmac->net_dev = net_dev;
14421442
bgmac->core = core;

‎drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3506,8 +3506,6 @@ static const struct ethtool_ops bnx2x_vf_ethtool_ops = {
35063506

35073507
void bnx2x_set_ethtool_ops(struct bnx2x *bp, struct net_device *netdev)
35083508
{
3509-
if (IS_PF(bp))
3510-
SET_ETHTOOL_OPS(netdev, &bnx2x_ethtool_ops);
3511-
else /* vf */
3512-
SET_ETHTOOL_OPS(netdev, &bnx2x_vf_ethtool_ops);
3509+
netdev->ethtool_ops = (IS_PF(bp)) ?
3510+
&bnx2x_ethtool_ops : &bnx2x_vf_ethtool_ops;
35133511
}

‎drivers/net/ethernet/broadcom/genet/bcmgenet.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2481,7 +2481,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
24812481
dev_set_drvdata(&pdev->dev, dev);
24822482
ether_addr_copy(dev->dev_addr, macaddr);
24832483
dev->watchdog_timeo = 2 * HZ;
2484-
SET_ETHTOOL_OPS(dev, &bcmgenet_ethtool_ops);
2484+
dev->ethtool_ops = &bcmgenet_ethtool_ops;
24852485
dev->netdev_ops = &bcmgenet_netdev_ops;
24862486
netif_napi_add(dev, &priv->napi, bcmgenet_poll, 64);
24872487

‎drivers/net/ethernet/brocade/bna/bnad_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1137,5 +1137,5 @@ static const struct ethtool_ops bnad_ethtool_ops = {
11371137
void
11381138
bnad_set_ethtool_ops(struct net_device *netdev)
11391139
{
1140-
SET_ETHTOOL_OPS(netdev, &bnad_ethtool_ops);
1140+
netdev->ethtool_ops = &bnad_ethtool_ops;
11411141
}

‎drivers/net/ethernet/calxeda/xgmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1737,7 +1737,7 @@ static int xgmac_probe(struct platform_device *pdev)
17371737
platform_set_drvdata(pdev, ndev);
17381738
ether_setup(ndev);
17391739
ndev->netdev_ops = &xgmac_netdev_ops;
1740-
SET_ETHTOOL_OPS(ndev, &xgmac_ethtool_ops);
1740+
ndev->ethtool_ops = &xgmac_ethtool_ops;
17411741
spin_lock_init(&priv->stats_lock);
17421742
INIT_WORK(&priv->tx_timeout_work, xgmac_tx_timeout_work);
17431743

‎drivers/net/ethernet/chelsio/cxgb/cxgb2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
11001100

11011101
netif_napi_add(netdev, &adapter->napi, t1_poll, 64);
11021102

1103-
SET_ETHTOOL_OPS(netdev, &t1_ethtool_ops);
1103+
netdev->ethtool_ops = &t1_ethtool_ops;
11041104
}
11051105

11061106
if (t1_init_sw_modules(adapter, bi) < 0) {

‎drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3291,7 +3291,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
32913291
netdev->features |= NETIF_F_HIGHDMA;
32923292

32933293
netdev->netdev_ops = &cxgb_netdev_ops;
3294-
SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
3294+
netdev->ethtool_ops = &cxgb_ethtool_ops;
32953295
}
32963296

32973297
pci_set_drvdata(pdev, adapter);

‎drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6083,7 +6083,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
60836083
netdev->priv_flags |= IFF_UNICAST_FLT;
60846084

60856085
netdev->netdev_ops = &cxgb4_netdev_ops;
6086-
SET_ETHTOOL_OPS(netdev, &cxgb_ethtool_ops);
6086+
netdev->ethtool_ops = &cxgb_ethtool_ops;
60876087
}
60886088

60896089
pci_set_drvdata(pdev, adapter);

‎drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2664,7 +2664,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
26642664
netdev->priv_flags |= IFF_UNICAST_FLT;
26652665

26662666
netdev->netdev_ops = &cxgb4vf_netdev_ops;
2667-
SET_ETHTOOL_OPS(netdev, &cxgb4vf_ethtool_ops);
2667+
netdev->ethtool_ops = &cxgb4vf_ethtool_ops;
26682668

26692669
/*
26702670
* Initialize the hardware/software state for the port.

‎drivers/net/ethernet/cisco/enic/enic_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,5 +253,5 @@ static const struct ethtool_ops enic_ethtool_ops = {
253253

254254
void enic_set_ethtool_ops(struct net_device *netdev)
255255
{
256-
SET_ETHTOOL_OPS(netdev, &enic_ethtool_ops);
256+
netdev->ethtool_ops = &enic_ethtool_ops;
257257
}

‎drivers/net/ethernet/dec/tulip/tulip_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
17031703
#ifdef CONFIG_TULIP_NAPI
17041704
netif_napi_add(dev, &tp->napi, tulip_poll, 16);
17051705
#endif
1706-
SET_ETHTOOL_OPS(dev, &ops);
1706+
dev->ethtool_ops = &ops;
17071707

17081708
if (register_netdev(dev))
17091709
goto err_out_free_ring;

‎drivers/net/ethernet/dlink/dl2k.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
227227
}
228228
dev->netdev_ops = &netdev_ops;
229229
dev->watchdog_timeo = TX_TIMEOUT;
230-
SET_ETHTOOL_OPS(dev, &ethtool_ops);
230+
dev->ethtool_ops = &ethtool_ops;
231231
#if 0
232232
dev->features = NETIF_F_IP_CSUM;
233233
#endif

‎drivers/net/ethernet/dlink/sundance.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ static int sundance_probe1(struct pci_dev *pdev,
577577

578578
/* The chip-specific entries in the device structure. */
579579
dev->netdev_ops = &netdev_ops;
580-
SET_ETHTOOL_OPS(dev, &ethtool_ops);
580+
dev->ethtool_ops = &ethtool_ops;
581581
dev->watchdog_timeo = TX_TIMEOUT;
582582

583583
pci_set_drvdata(pdev, dev);

‎drivers/net/ethernet/emulex/benet/be_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4304,7 +4304,7 @@ static void be_netdev_init(struct net_device *netdev)
43044304

43054305
netdev->netdev_ops = &be_netdev_ops;
43064306

4307-
SET_ETHTOOL_OPS(netdev, &be_ethtool_ops);
4307+
netdev->ethtool_ops = &be_ethtool_ops;
43084308
}
43094309

43104310
static void be_unmap_pci_bars(struct be_adapter *adapter)

‎drivers/net/ethernet/faraday/ftgmac100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
12101210

12111211
SET_NETDEV_DEV(netdev, &pdev->dev);
12121212

1213-
SET_ETHTOOL_OPS(netdev, &ftgmac100_ethtool_ops);
1213+
netdev->ethtool_ops = &ftgmac100_ethtool_ops;
12141214
netdev->netdev_ops = &ftgmac100_netdev_ops;
12151215
netdev->features = NETIF_F_IP_CSUM | NETIF_F_GRO;
12161216

‎drivers/net/ethernet/faraday/ftmac100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ static int ftmac100_probe(struct platform_device *pdev)
10851085
}
10861086

10871087
SET_NETDEV_DEV(netdev, &pdev->dev);
1088-
SET_ETHTOOL_OPS(netdev, &ftmac100_ethtool_ops);
1088+
netdev->ethtool_ops = &ftmac100_ethtool_ops;
10891089
netdev->netdev_ops = &ftmac100_netdev_ops;
10901090

10911091
platform_set_drvdata(pdev, netdev);

‎drivers/net/ethernet/freescale/ucc_geth_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,5 +417,5 @@ static const struct ethtool_ops uec_ethtool_ops = {
417417

418418
void uec_set_ethtool_ops(struct net_device *netdev)
419419
{
420-
SET_ETHTOOL_OPS(netdev, &uec_ethtool_ops);
420+
netdev->ethtool_ops = &uec_ethtool_ops;
421421
}

‎drivers/net/ethernet/fujitsu/fmvj18x_cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ static int fmvj18x_probe(struct pcmcia_device *link)
256256
dev->netdev_ops = &fjn_netdev_ops;
257257
dev->watchdog_timeo = TX_TIMEOUT;
258258

259-
SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
259+
dev->ethtool_ops = &netdev_ethtool_ops;
260260

261261
return fmvj18x_config(link);
262262
} /* fmvj18x_attach */

‎drivers/net/ethernet/ibm/ehea/ehea_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,5 +278,5 @@ static const struct ethtool_ops ehea_ethtool_ops = {
278278

279279
void ehea_set_ethtool_ops(struct net_device *netdev)
280280
{
281-
SET_ETHTOOL_OPS(netdev, &ehea_ethtool_ops);
281+
netdev->ethtool_ops = &ehea_ethtool_ops;
282282
}

‎drivers/net/ethernet/ibm/emac/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2879,7 +2879,7 @@ static int emac_probe(struct platform_device *ofdev)
28792879
dev->commac.ops = &emac_commac_sg_ops;
28802880
} else
28812881
ndev->netdev_ops = &emac_netdev_ops;
2882-
SET_ETHTOOL_OPS(ndev, &emac_ethtool_ops);
2882+
ndev->ethtool_ops = &emac_ethtool_ops;
28832883

28842884
netif_carrier_off(ndev);
28852885

‎drivers/net/ethernet/icplus/ipg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2245,7 +2245,7 @@ static int ipg_probe(struct pci_dev *pdev, const struct pci_device_id *id)
22452245
*/
22462246
dev->netdev_ops = &ipg_netdev_ops;
22472247
SET_NETDEV_DEV(dev, &pdev->dev);
2248-
SET_ETHTOOL_OPS(dev, &ipg_ethtool_ops);
2248+
dev->ethtool_ops = &ipg_ethtool_ops;
22492249

22502250
rc = pci_request_regions(pdev, DRV_NAME);
22512251
if (rc)

‎drivers/net/ethernet/intel/e100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2854,7 +2854,7 @@ static int e100_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
28542854
netdev->hw_features |= NETIF_F_RXALL;
28552855

28562856
netdev->netdev_ops = &e100_netdev_ops;
2857-
SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
2857+
netdev->ethtool_ops = &e100_ethtool_ops;
28582858
netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
28592859
strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
28602860

‎drivers/net/ethernet/intel/e1000/e1000_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1905,5 +1905,5 @@ static const struct ethtool_ops e1000_ethtool_ops = {
19051905

19061906
void e1000_set_ethtool_ops(struct net_device *netdev)
19071907
{
1908-
SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
1908+
netdev->ethtool_ops = &e1000_ethtool_ops;
19091909
}

‎drivers/net/ethernet/intel/e1000e/ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2318,5 +2318,5 @@ static const struct ethtool_ops e1000_ethtool_ops = {
23182318

23192319
void e1000e_set_ethtool_ops(struct net_device *netdev)
23202320
{
2321-
SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
2321+
netdev->ethtool_ops = &e1000_ethtool_ops;
23222322
}

‎drivers/net/ethernet/intel/i40e/i40e_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1700,5 +1700,5 @@ static const struct ethtool_ops i40e_ethtool_ops = {
17001700

17011701
void i40e_set_ethtool_ops(struct net_device *netdev)
17021702
{
1703-
SET_ETHTOOL_OPS(netdev, &i40e_ethtool_ops);
1703+
netdev->ethtool_ops = &i40e_ethtool_ops;
17041704
}

‎drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,5 +705,5 @@ static struct ethtool_ops i40evf_ethtool_ops = {
705705
**/
706706
void i40evf_set_ethtool_ops(struct net_device *netdev)
707707
{
708-
SET_ETHTOOL_OPS(netdev, &i40evf_ethtool_ops);
708+
netdev->ethtool_ops = &i40evf_ethtool_ops;
709709
}

‎drivers/net/ethernet/intel/igb/igb_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3035,5 +3035,5 @@ static const struct ethtool_ops igb_ethtool_ops = {
30353035

30363036
void igb_set_ethtool_ops(struct net_device *netdev)
30373037
{
3038-
SET_ETHTOOL_OPS(netdev, &igb_ethtool_ops);
3038+
netdev->ethtool_ops = &igb_ethtool_ops;
30393039
}

‎drivers/net/ethernet/intel/igbvf/ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,5 +476,5 @@ static const struct ethtool_ops igbvf_ethtool_ops = {
476476

477477
void igbvf_set_ethtool_ops(struct net_device *netdev)
478478
{
479-
SET_ETHTOOL_OPS(netdev, &igbvf_ethtool_ops);
479+
netdev->ethtool_ops = &igbvf_ethtool_ops;
480480
}

‎drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,5 +656,5 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
656656

657657
void ixgb_set_ethtool_ops(struct net_device *netdev)
658658
{
659-
SET_ETHTOOL_OPS(netdev, &ixgb_ethtool_ops);
659+
netdev->ethtool_ops = &ixgb_ethtool_ops;
660660
}

0 commit comments

Comments
 (0)