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: Ethan Zhao <ethan.zhao@oracle.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index 06744f86fbc2d83eaec3fd261ea099d6a1d22deb..75a56fa1ceadfa4e78dd3c504627bf236796da1b 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -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;

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 6a12bb1d49caf939de62acd49572e5312f68e793..bcd697c4b08a8e4ef54a490ef98739709d36e05a 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -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))