qlcnic: remove unused register

Removing register defines which are not used by Qlgoic CNA device.

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.h b/drivers/net/qlcnic/qlcnic.h
index 2ed34cd43e1cd0d452e4406e71ff47fa0c24d051..896d40df9a134dddb3c470373c3c4f01a44e7976 100644 (file)
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -149,8 +149,6 @@
 #define get_next_index(index, length)  \
        (((index) + 1) & ((length) - 1))
 
-#define MPORT_MULTI_FUNCTION_MODE 0x2222
-
 /*
  * Following data structures describe the descriptors that will be used.
  * Added fileds of tcpHdrSize and ipHdrSize, The driver needs to do it only when

diff --git a/drivers/net/qlcnic/qlcnic_hdr.h b/drivers/net/qlcnic/qlcnic_hdr.h
index 13740785d05146f9fb5aa8c95d816f24215781c2..ad9d167723c4480793a98153c0c3e0319c809ccc 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/qlcnic/qlcnic_hdr.h
@@ -563,31 +563,15 @@ enum {
 #define CRB_PF_LINK_SPEED_1            (QLCNIC_REG(0xe8))
 #define CRB_PF_LINK_SPEED_2            (QLCNIC_REG(0xec))
 
-#define CRB_MPORT_MODE                 (QLCNIC_REG(0xc4))
-#define CRB_DMA_SHIFT                  (QLCNIC_REG(0xcc))
-
 #define CRB_TEMP_STATE                 (QLCNIC_REG(0x1b4))
 
 #define CRB_V2P_0                      (QLCNIC_REG(0x290))
 #define CRB_V2P(port)                  (CRB_V2P_0+((port)*4))
 #define CRB_DRIVER_VERSION             (QLCNIC_REG(0x2a0))
 
-#define CRB_SW_INT_MASK_0              (QLCNIC_REG(0x1d8))
-#define CRB_SW_INT_MASK_1              (QLCNIC_REG(0x1e0))
-#define CRB_SW_INT_MASK_2              (QLCNIC_REG(0x1e4))
-#define CRB_SW_INT_MASK_3              (QLCNIC_REG(0x1e8))
-
 #define CRB_FW_CAPABILITIES_1          (QLCNIC_CAM_RAM(0x128))
 #define CRB_MAC_BLOCK_START            (QLCNIC_CAM_RAM(0x1c0))
 
-/*
- * capabilities register, can be used to selectively enable/disable features
- * for backward compability
- */
-#define CRB_NIC_CAPABILITIES_HOST      QLCNIC_REG(0x1a8)
-
-#define INTR_SCHEME_PERPORT            0x1
-
 /*
  * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address
  * which can be read by the Phantom host to get producer/consumer indexes from

diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index dccd8c3d65e5f0bd65335a51568bb918e1902b88..71a4e664ad76970d920c669f3fa8366f92ca62fa 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_init.c
+++ b/drivers/net/qlcnic/qlcnic_init.c
@@ -1184,8 +1184,6 @@ int qlcnic_init_firmware(struct qlcnic_adapter *adapter)
        if (err)
                return err;
 
-       QLCWR32(adapter, CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);
-       QLCWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);
        QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);
 
        return err;

diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index dde1e8aaf20e51d4652f8177ae5d00becb4dccb7..f8bd1bd29b4bfdedde62ce7e4842fe9c2e8e3de5 100644 (file)
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -606,7 +606,6 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter)
                msleep(1);
        }
 
-       QLCWR32(adapter, CRB_DMA_SHIFT, 0x55555555);
        QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS1, 0);
        QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS2, 0);