Skip to content

Commit 47ea032

Browse files
Ivan Veceradavem330
authored andcommitted
drivers/net: get rid of unnecessary initializations in .get_drvinfo()
Many drivers initialize uselessly n_priv_flags, n_stats, testinfo_len, eedump_len & regdump_len fields in their .get_drvinfo() ethtool op. It's not necessary as these fields is filled in ethtool_get_drvinfo(). v2: removed unused variable v3: removed another unused variable Signed-off-by: Ivan Vecera <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ae23051 commit 47ea032

File tree

50 files changed

+0
-113
lines changed

Some content is hidden

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

50 files changed

+0
-113
lines changed

drivers/infiniband/hw/nes/nes_nic.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,9 +1325,6 @@ static void nes_netdev_get_drvinfo(struct net_device *netdev,
13251325
"%u.%u", nesadapter->firmware_version >> 16,
13261326
nesadapter->firmware_version & 0x000000ff);
13271327
strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
1328-
drvinfo->testinfo_len = 0;
1329-
drvinfo->eedump_len = 0;
1330-
drvinfo->regdump_len = 0;
13311328
}
13321329

13331330

drivers/net/ethernet/aeroflex/greth.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,8 +1141,6 @@ static void greth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *in
11411141
strlcpy(info->version, "revision: 1.0", sizeof(info->version));
11421142
strlcpy(info->bus_info, greth->dev->bus->name, sizeof(info->bus_info));
11431143
strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
1144-
info->eedump_len = 0;
1145-
info->regdump_len = sizeof(struct greth_regs);
11461144
}
11471145

11481146
static void greth_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)

drivers/net/ethernet/amd/au1000_eth.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,6 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
714714
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
715715
snprintf(info->bus_info, sizeof(info->bus_info), "%s %d", DRV_NAME,
716716
aup->mac_id);
717-
info->regdump_len = 0;
718717
}
719718

720719
static void au1000_set_msglevel(struct net_device *dev, u32 value)

drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ static void xgbe_get_drvinfo(struct net_device *netdev,
375375
XGMAC_GET_BITS(hw_feat->version, MAC_VR, USERVER),
376376
XGMAC_GET_BITS(hw_feat->version, MAC_VR, DEVID),
377377
XGMAC_GET_BITS(hw_feat->version, MAC_VR, SNPSVER));
378-
drvinfo->n_stats = XGBE_STATS_COUNT;
379378
}
380379

381380
static u32 xgbe_get_msglevel(struct net_device *netdev)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,6 @@ static void atl1c_get_drvinfo(struct net_device *netdev,
233233
sizeof(drvinfo->version));
234234
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
235235
sizeof(drvinfo->bus_info));
236-
drvinfo->n_stats = 0;
237-
drvinfo->testinfo_len = 0;
238-
drvinfo->regdump_len = atl1c_get_regs_len(netdev);
239-
drvinfo->eedump_len = atl1c_get_eeprom_len(netdev);
240236
}
241237

242238
static void atl1c_get_wol(struct net_device *netdev,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,6 @@ static void atl1e_get_drvinfo(struct net_device *netdev,
316316
strlcpy(drvinfo->fw_version, "L1e", sizeof(drvinfo->fw_version));
317317
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
318318
sizeof(drvinfo->bus_info));
319-
drvinfo->n_stats = 0;
320-
drvinfo->testinfo_len = 0;
321-
drvinfo->regdump_len = atl1e_get_regs_len(netdev);
322-
drvinfo->eedump_len = atl1e_get_eeprom_len(netdev);
323319
}
324320

325321
static void atl1e_get_wol(struct net_device *netdev,

drivers/net/ethernet/atheros/atlx/atl1.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3388,7 +3388,6 @@ static void atl1_get_drvinfo(struct net_device *netdev,
33883388
sizeof(drvinfo->version));
33893389
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
33903390
sizeof(drvinfo->bus_info));
3391-
drvinfo->eedump_len = ATL1_EEDUMP_LEN;
33923391
}
33933392

33943393
static void atl1_get_wol(struct net_device *netdev,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,10 +2030,6 @@ static void atl2_get_drvinfo(struct net_device *netdev,
20302030
strlcpy(drvinfo->fw_version, "L2", sizeof(drvinfo->fw_version));
20312031
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
20322032
sizeof(drvinfo->bus_info));
2033-
drvinfo->n_stats = 0;
2034-
drvinfo->testinfo_len = 0;
2035-
drvinfo->regdump_len = atl2_get_regs_len(netdev);
2036-
drvinfo->eedump_len = atl2_get_eeprom_len(netdev);
20372033
}
20382034

20392035
static void atl2_get_wol(struct net_device *netdev,

drivers/net/ethernet/broadcom/bcm63xx_enet.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,6 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev,
13331333
sizeof(drvinfo->version));
13341334
strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
13351335
strlcpy(drvinfo->bus_info, "bcm63xx", sizeof(drvinfo->bus_info));
1336-
drvinfo->n_stats = BCM_ENET_STATS_LEN;
13371336
}
13381337

13391338
static int bcm_enet_get_sset_count(struct net_device *netdev,
@@ -2597,7 +2596,6 @@ static void bcm_enetsw_get_drvinfo(struct net_device *netdev,
25972596
strncpy(drvinfo->version, bcm_enet_driver_version, 32);
25982597
strncpy(drvinfo->fw_version, "N/A", 32);
25992598
strncpy(drvinfo->bus_info, "bcm63xx", 32);
2600-
drvinfo->n_stats = BCM_ENETSW_STATS_LEN;
26012599
}
26022600

26032601
static void bcm_enetsw_get_ethtool_stats(struct net_device *netdev,

drivers/net/ethernet/broadcom/bcmsysport.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ static void bcm_sysport_get_drvinfo(struct net_device *dev,
287287
strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
288288
strlcpy(info->version, "0.1", sizeof(info->version));
289289
strlcpy(info->bus_info, "platform", sizeof(info->bus_info));
290-
info->n_stats = BCM_SYSPORT_STATS_LEN;
291290
}
292291

293292
static u32 bcm_sysport_get_msglvl(struct net_device *dev)

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,10 +1090,6 @@ static void bnx2x_get_drvinfo(struct net_device *dev,
10901090
bnx2x_fill_fw_str(bp, info->fw_version, sizeof(info->fw_version));
10911091

10921092
strlcpy(info->bus_info, pci_name(bp->pdev), sizeof(info->bus_info));
1093-
info->n_stats = BNX2X_NUM_STATS;
1094-
info->testinfo_len = BNX2X_NUM_TESTS(bp);
1095-
info->eedump_len = bp->common.flash_size;
1096-
info->regdump_len = bnx2x_get_regs_len(dev);
10971093
}
10981094

10991095
static void bnx2x_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,6 @@ static void bcmgenet_get_drvinfo(struct net_device *dev,
793793
{
794794
strlcpy(info->driver, "bcmgenet", sizeof(info->driver));
795795
strlcpy(info->version, "v2.0", sizeof(info->version));
796-
info->n_stats = BCMGENET_STATS_LEN;
797796
}
798797

799798
static int bcmgenet_get_sset_count(struct net_device *dev, int string_set)

drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ lio_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
153153
strncpy(drvinfo->fw_version, oct->fw_info.liquidio_firmware_version,
154154
ETHTOOL_FWVERS_LEN);
155155
strncpy(drvinfo->bus_info, pci_name(oct->pci_dev), 32);
156-
drvinfo->regdump_len = OCT_ETHTOOL_REGDUMP_LEN;
157156
}
158157

159158
static void

drivers/net/ethernet/dec/tulip/de2104x.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,6 @@ static void de_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info)
15971597
strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
15981598
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
15991599
strlcpy(info->bus_info, pci_name(de->pdev), sizeof(info->bus_info));
1600-
info->eedump_len = DE_EEPROM_SIZE;
16011600
}
16021601

16031602
static int de_get_regs_len(struct net_device *dev)

drivers/net/ethernet/emulex/benet/be_ethtool.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@ static void be_get_drvinfo(struct net_device *netdev,
234234

235235
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
236236
sizeof(drvinfo->bus_info));
237-
drvinfo->testinfo_len = 0;
238-
drvinfo->regdump_len = 0;
239-
drvinfo->eedump_len = 0;
240237
}
241238

242239
static u32 lancer_cmd_get_file_len(struct be_adapter *adapter, u8 *file_name)

drivers/net/ethernet/freescale/gianfar_ethtool.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@ static void gfar_gdrvinfo(struct net_device *dev,
182182
sizeof(drvinfo->version));
183183
strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
184184
strlcpy(drvinfo->bus_info, "N/A", sizeof(drvinfo->bus_info));
185-
drvinfo->regdump_len = 0;
186-
drvinfo->eedump_len = 0;
187185
}
188186

189187

drivers/net/ethernet/freescale/ucc_geth_ethtool.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,8 +351,6 @@ uec_get_drvinfo(struct net_device *netdev,
351351
strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
352352
strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
353353
strlcpy(drvinfo->bus_info, "QUICC ENGINE", sizeof(drvinfo->bus_info));
354-
drvinfo->eedump_len = 0;
355-
drvinfo->regdump_len = uec_get_regs_len(netdev);
356354
}
357355

358356
#ifdef CONFIG_PM

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,6 @@ static void hns_nic_get_drvinfo(struct net_device *net_dev,
682682
drvinfo->bus_info[ETHTOOL_BUSINFO_LEN - 1] = '\0';
683683

684684
strncpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN);
685-
drvinfo->eedump_len = 0;
686685
}
687686

688687
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,6 @@ static void emac_ethtool_get_drvinfo(struct net_device *ndev,
22042204
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
22052205
snprintf(info->bus_info, sizeof(info->bus_info), "PPC 4xx EMAC-%d %s",
22062206
dev->cell_index, dev->ofdev->dev.of_node->full_name);
2207-
info->regdump_len = emac_ethtool_get_regs_len(ndev);
22082207
}
22092208

22102209
static const struct ethtool_ops emac_ethtool_ops = {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,6 @@ static void e1000_get_drvinfo(struct net_device *netdev,
559559

560560
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
561561
sizeof(drvinfo->bus_info));
562-
drvinfo->regdump_len = e1000_get_regs_len(netdev);
563-
drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
564562
}
565563

566564
static void e1000_get_ringparam(struct net_device *netdev,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -648,8 +648,6 @@ static void e1000_get_drvinfo(struct net_device *netdev,
648648

649649
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
650650
sizeof(drvinfo->bus_info));
651-
drvinfo->regdump_len = e1000_get_regs_len(netdev);
652-
drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
653651
}
654652

655653
static void e1000_get_ringparam(struct net_device *netdev,

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -515,10 +515,6 @@ static void fm10k_get_drvinfo(struct net_device *dev,
515515
sizeof(info->version) - 1);
516516
strncpy(info->bus_info, pci_name(interface->pdev),
517517
sizeof(info->bus_info) - 1);
518-
519-
info->n_stats = fm10k_get_sset_count(dev, ETH_SS_STATS);
520-
521-
info->regdump_len = fm10k_get_regs_len(dev);
522518
}
523519

524520
static void fm10k_get_pauseparam(struct net_device *dev,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,6 @@ static void i40e_get_drvinfo(struct net_device *netdev,
11261126
sizeof(drvinfo->fw_version));
11271127
strlcpy(drvinfo->bus_info, pci_name(pf->pdev),
11281128
sizeof(drvinfo->bus_info));
1129-
drvinfo->n_priv_flags = I40E_PRIV_FLAGS_STR_LEN;
11301129
}
11311130

11321131
static void i40e_get_ringparam(struct net_device *netdev,

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -842,10 +842,6 @@ static void igb_get_drvinfo(struct net_device *netdev,
842842
sizeof(drvinfo->fw_version));
843843
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
844844
sizeof(drvinfo->bus_info));
845-
drvinfo->n_stats = IGB_STATS_LEN;
846-
drvinfo->testinfo_len = IGB_TEST_LEN;
847-
drvinfo->regdump_len = igb_get_regs_len(netdev);
848-
drvinfo->eedump_len = igb_get_eeprom_len(netdev);
849845
}
850846

851847
static void igb_get_ringparam(struct net_device *netdev,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ static void igbvf_get_drvinfo(struct net_device *netdev,
196196
sizeof(drvinfo->version));
197197
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
198198
sizeof(drvinfo->bus_info));
199-
drvinfo->regdump_len = igbvf_get_regs_len(netdev);
200-
drvinfo->eedump_len = igbvf_get_eeprom_len(netdev);
201199
}
202200

203201
static void igbvf_get_ringparam(struct net_device *netdev,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,6 @@ ixgb_get_drvinfo(struct net_device *netdev,
479479
sizeof(drvinfo->version));
480480
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
481481
sizeof(drvinfo->bus_info));
482-
drvinfo->n_stats = IXGB_STATS_LEN;
483-
drvinfo->regdump_len = ixgb_get_regs_len(netdev);
484-
drvinfo->eedump_len = ixgb_get_eeprom_len(netdev);
485482
}
486483

487484
static void

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -943,9 +943,6 @@ static void ixgbe_get_drvinfo(struct net_device *netdev,
943943

944944
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
945945
sizeof(drvinfo->bus_info));
946-
drvinfo->n_stats = IXGBE_STATS_LEN;
947-
drvinfo->testinfo_len = IXGBE_TEST_LEN;
948-
drvinfo->regdump_len = ixgbe_get_regs_len(netdev);
949946
}
950947

951948
static void ixgbe_get_ringparam(struct net_device *netdev,

drivers/net/ethernet/marvell/mv643xx_eth.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1586,7 +1586,6 @@ static void mv643xx_eth_get_drvinfo(struct net_device *dev,
15861586
sizeof(drvinfo->version));
15871587
strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
15881588
strlcpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info));
1589-
drvinfo->n_stats = ARRAY_SIZE(mv643xx_eth_stats);
15901589
}
15911590

15921591
static int mv643xx_eth_nway_reset(struct net_device *dev)

drivers/net/ethernet/mellanox/mlx4/en_ethtool.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,6 @@ mlx4_en_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
9595
(u16) (mdev->dev->caps.fw_ver & 0xffff));
9696
strlcpy(drvinfo->bus_info, pci_name(mdev->dev->persist->pdev),
9797
sizeof(drvinfo->bus_info));
98-
drvinfo->n_stats = 0;
99-
drvinfo->regdump_len = 0;
100-
drvinfo->eedump_len = 0;
10198
}
10299

103100
static const char mlx4_en_priv_flags[][ETH_GSTRING_LEN] = {

drivers/net/ethernet/neterion/s2io.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5389,8 +5389,6 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,
53895389
strlcpy(info->driver, s2io_driver_name, sizeof(info->driver));
53905390
strlcpy(info->version, s2io_driver_version, sizeof(info->version));
53915391
strlcpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info));
5392-
info->regdump_len = XENA_REG_SPACE;
5393-
info->eedump_len = XENA_EEPROM_SPACE;
53945392
}
53955393

53965394
/**

drivers/net/ethernet/neterion/vxge/vxge-ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,6 @@ static void vxge_ethtool_gdrvinfo(struct net_device *dev,
105105
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
106106
strlcpy(info->fw_version, vdev->fw_version, sizeof(info->fw_version));
107107
strlcpy(info->bus_info, pci_name(vdev->pdev), sizeof(info->bus_info));
108-
info->regdump_len = sizeof(struct vxge_hw_vpath_reg)
109-
* vdev->no_of_vpath;
110-
111-
info->n_stats = STAT_LEN;
112108
}
113109

114110
/**

drivers/net/ethernet/octeon/octeon_mgmt.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,10 +1344,6 @@ static void octeon_mgmt_get_drvinfo(struct net_device *netdev,
13441344
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
13451345
strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
13461346
strlcpy(info->bus_info, "N/A", sizeof(info->bus_info));
1347-
info->n_stats = 0;
1348-
info->testinfo_len = 0;
1349-
info->regdump_len = 0;
1350-
info->eedump_len = 0;
13511347
}
13521348

13531349
static int octeon_mgmt_get_settings(struct net_device *netdev,

drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ static void pch_gbe_get_drvinfo(struct net_device *netdev,
164164
strlcpy(drvinfo->version, pch_driver_version, sizeof(drvinfo->version));
165165
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
166166
sizeof(drvinfo->bus_info));
167-
drvinfo->regdump_len = pch_gbe_get_regs_len(netdev);
168167
}
169168

170169
/**

drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
9393

9494
strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
9595
sizeof(drvinfo->bus_info));
96-
drvinfo->regdump_len = NETXEN_NIC_REGS_LEN;
97-
drvinfo->eedump_len = netxen_nic_get_eeprom_len(dev);
9896
}
9997

10098
static int

drivers/net/ethernet/qlogic/qla3xxx.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1736,8 +1736,6 @@ static void ql_get_drvinfo(struct net_device *ndev,
17361736
sizeof(drvinfo->version));
17371737
strlcpy(drvinfo->bus_info, pci_name(qdev->pdev),
17381738
sizeof(drvinfo->bus_info));
1739-
drvinfo->regdump_len = 0;
1740-
drvinfo->eedump_len = 0;
17411739
}
17421740

17431741
static u32 ql_get_msglevel(struct net_device *ndev)

drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -415,13 +415,6 @@ static void ql_get_drvinfo(struct net_device *ndev,
415415
(qdev->fw_rev_id & 0x000000ff));
416416
strlcpy(drvinfo->bus_info, pci_name(qdev->pdev),
417417
sizeof(drvinfo->bus_info));
418-
drvinfo->n_stats = 0;
419-
drvinfo->testinfo_len = 0;
420-
if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))
421-
drvinfo->regdump_len = sizeof(struct ql_mpi_coredump);
422-
else
423-
drvinfo->regdump_len = sizeof(struct ql_reg_dump);
424-
drvinfo->eedump_len = 0;
425418
}
426419

427420
static void ql_get_wol(struct net_device *ndev, struct ethtool_wolinfo *wol)

drivers/net/ethernet/realtek/8139too.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2388,7 +2388,6 @@ static void rtl8139_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *
23882388
strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
23892389
strlcpy(info->version, DRV_VERSION, sizeof(info->version));
23902390
strlcpy(info->bus_info, pci_name(tp->pci_dev), sizeof(info->bus_info));
2391-
info->regdump_len = tp->regs_len;
23922391
}
23932392

23942393
static int rtl8139_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

drivers/net/ethernet/sun/cassini.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,9 +4529,6 @@ static void cas_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
45294529
strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
45304530
strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
45314531
strlcpy(info->bus_info, pci_name(cp->pdev), sizeof(info->bus_info));
4532-
info->regdump_len = cp->casreg_len < CAS_MAX_REGS ?
4533-
cp->casreg_len : CAS_MAX_REGS;
4534-
info->n_stats = CAS_NUM_STAT_KEYS;
45354532
}
45364533

45374534
static int cas_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

drivers/net/ethernet/tehuti/tehuti.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2182,11 +2182,6 @@ bdx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
21822182
strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
21832183
strlcpy(drvinfo->bus_info, pci_name(priv->pdev),
21842184
sizeof(drvinfo->bus_info));
2185-
2186-
drvinfo->n_stats = ((priv->stats_flag) ? ARRAY_SIZE(bdx_stat_names) : 0);
2187-
drvinfo->testinfo_len = 0;
2188-
drvinfo->regdump_len = 0;
2189-
drvinfo->eedump_len = 0;
21902185
}
21912186

21922187
/*

drivers/net/ethernet/ti/cpmac.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,6 @@ static void cpmac_get_drvinfo(struct net_device *dev,
899899
strlcpy(info->driver, "cpmac", sizeof(info->driver));
900900
strlcpy(info->version, CPMAC_VERSION, sizeof(info->version));
901901
snprintf(info->bus_info, sizeof(info->bus_info), "%s", "cpmac");
902-
info->regdump_len = 0;
903902
}
904903

905904
static const struct ethtool_ops cpmac_ethtool_ops = {

drivers/net/ethernet/ti/cpsw.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,6 @@ static void cpsw_get_drvinfo(struct net_device *ndev,
17841784
strlcpy(info->driver, "cpsw", sizeof(info->driver));
17851785
strlcpy(info->version, "1.0", sizeof(info->version));
17861786
strlcpy(info->bus_info, priv->pdev->name, sizeof(info->bus_info));
1787-
info->regdump_len = cpsw_get_regs_len(ndev);
17881787
}
17891788

17901789
static u32 cpsw_get_msglevel(struct net_device *ndev)

drivers/net/ethernet/ti/tlan.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,6 @@ static void tlan_get_drvinfo(struct net_device *dev,
791791
sizeof(info->bus_info));
792792
else
793793
strlcpy(info->bus_info, "EISA", sizeof(info->bus_info));
794-
info->eedump_len = TLAN_EEPROM_SIZE;
795794
}
796795

797796
static int tlan_get_eeprom_len(struct net_device *dev)

0 commit comments

Comments
 (0)