qlcnic: remove obsolete register

MSI_MODE, CAPABILITIES_FW and SCRATCHPAD registers are obsolete.
Driver should not use them.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/qlcnic/qlcnic_ethtool.c b/drivers/net/qlcnic/qlcnic_ethtool.c
index 6cdc5ebb7411d7ba6daf63425fa04f8712ca2314..e494cccf8a93175089c879844fc0e13625ec2acf 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/qlcnic/qlcnic_ethtool.c
@@ -606,19 +606,12 @@ qlcnic_set_pauseparam(struct net_device *netdev,
 static int qlcnic_reg_test(struct net_device *dev)
 {
        struct qlcnic_adapter *adapter = netdev_priv(dev);
-       u32 data_read, data_written;
+       u32 data_read;
 
        data_read = QLCRD32(adapter, QLCNIC_PCIX_PH_REG(0));
        if ((data_read & 0xffff) != adapter->pdev->vendor)
                return 1;
 
-       data_written = (u32)0xa5a5a5a5;
-
-       QLCWR32(adapter, CRB_SCRATCHPAD_TEST, data_written);
-       data_read = QLCRD32(adapter, CRB_SCRATCHPAD_TEST);
-       if (data_written != data_read)
-               return 1;
-
        return 0;
 }
 

diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/qlcnic/qlcnic_hdr.h
index a984cd227582cfc40f533517740e5b10de57b488..13740785d05146f9fb5aa8c95d816f24215781c2 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/qlcnic/qlcnic_hdr.h
@@ -585,15 +585,8 @@ enum {
  * for backward compability
  */
 #define CRB_NIC_CAPABILITIES_HOST      QLCNIC_REG(0x1a8)
-#define CRB_NIC_CAPABILITIES_FW        QLCNIC_REG(0x1dc)
-#define CRB_NIC_MSI_MODE_HOST          QLCNIC_REG(0x270)
-#define CRB_NIC_MSI_MODE_FW            QLCNIC_REG(0x274)
 
 #define INTR_SCHEME_PERPORT            0x1
-#define MSI_MODE_MULTIFUNC             0x1
-
-/* used for ethtool tests */
-#define CRB_SCRATCHPAD_TEST        QLCNIC_REG(0x280)
 
 /*
  * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address

diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index 1b621ca13e25f075928c1488fe149855bac135e4..9b010422e9a683fa1529f116f6ed8f53b8a5aeca 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -1189,7 +1189,6 @@ int qlcnic_init_firmware(struct qlcnic_adapter *adapter)
                return err;
 
        QLCWR32(adapter, CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);
-       QLCWR32(adapter, CRB_NIC_MSI_MODE_HOST, MSI_MODE_MULTIFUNC);
        QLCWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);
        QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);