qed: Remove unused NVM vendor ID

Remove 2 unused fields from driver code.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Orabug: 23732603
Signed-off-by: Manjunath Govindashetty <manjunath.govindashetty@oracle.com>

diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 66b021e3c1be124fd3973aee7d9c597eb6cf7ee2..e5604eec81bf22789fb6abe838fcbbb88f6db161 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -146,9 +146,6 @@ struct qed_hw_info {
        u16                             ovlan;
        u32                             part_num[4];
 
-       u32                             vendor_id;
-       u32                             device_id;
-
        unsigned char                   hw_mac_addr[ETH_ALEN];
 
        struct qed_igu_info             *p_igu_info;

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c
index c3f293d179918268ae9c261ba35a95e17192ce77..b7d100f6bd6fac64d90977b920a7a29150cd5427 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1083,13 +1083,6 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn,
        /* Read nvm_cfg1  (Notice this is just offset, and not offsize (TBD) */
        nvm_cfg1_offset = qed_rd(p_hwfn, p_ptt, nvm_cfg_addr + 4);
 
-       /* Read Vendor Id / Device Id */
-       addr = MCP_REG_SCRATCH + nvm_cfg1_offset +
-              offsetof(struct nvm_cfg1, glob) +
-              offsetof(struct nvm_cfg1_glob, pci_id);
-       p_hwfn->hw_info.vendor_id = qed_rd(p_hwfn, p_ptt, addr) &
-                                   NVM_CFG1_GLOB_VENDOR_ID_MASK;
-
        addr = MCP_REG_SCRATCH + nvm_cfg1_offset +
               offsetof(struct nvm_cfg1, glob) +
               offsetof(struct nvm_cfg1_glob, core_cfg);