Commit d38e9248 authored by Ethan Zhao's avatar Ethan Zhao Committed by Jeff Kirsher
Browse files

ixgbe: remove useless bd_number from adapter struct 



Because bd_number is not useful anymore, so remove it from adapter struct, or
if keep it, we have to fix the boards driven counter bug in ixgbe_remove() and
ixgbe_probe() only for trivial debug purpose -- other output is enough.

Signed-off-by: default avatarEthan Zhao <ethan.zhao@oracle.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8d34b31e

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+0 −2
Original line number Diff line number Diff line
@@ -728,8 +728,6 @@ struct ixgbe_adapter { 
	u8 __iomem *io_addr; /* Mainly for iounmap use */

	u32 wol;



	u16 bd_number;



	u16 eeprom_verh;

	u16 eeprom_verl;

	u16 eeprom_cap;

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

+0 −4
Original line number Diff line number Diff line
@@ -7981,7 +7981,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct ixgbe_adapter *adapter = NULL;

	struct ixgbe_hw *hw;

	const struct ixgbe_info *ii = ixgbe_info_tbl[ent->driver_data];

	static int cards_found;

	int i, err, pci_using_dac, expected_gts;

	unsigned int indices = MAX_TX_QUEUES;

	u8 part_str[IXGBE_PBANUM_LENGTH];
@@ -8067,8 +8066,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	netdev->watchdog_timeo = 5 * HZ;

	strlcpy(netdev->name, pci_name(pdev), sizeof(netdev->name));



	adapter->bd_number = cards_found;



	/* Setup hw api */

	memcpy(&hw->mac.ops, ii->mac_ops, sizeof(hw->mac.ops));

	hw->mac.type  = ii->mac;
@@ -8352,7 +8349,6 @@ skip_sriov: 
	ixgbe_add_sanmac_netdev(netdev);



	e_dev_info("%s\n", ixgbe_default_device_descr);

	cards_found++;



#ifdef CONFIG_IXGBE_HWMON

	if (ixgbe_sysfs_init(adapter))

CRA Git | Maintained and supported by SUSTech CRA and CCSE