aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2010-05-16 21:22:13 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-17 20:30:55 -0400
commit20c67bd40eacf26c8d61727aaf9cc791d682b40a (patch)
treebb35a49efd79dc37d48804b12fe480635fd167ce /drivers
parent78ad38923094a479453f5b02b37a012377a36f34 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/qlcnic/qlcnic.h2
-rw-r--r--drivers/net/qlcnic/qlcnic_hdr.h16
-rw-r--r--drivers/net/qlcnic/qlcnic_init.c2
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c1
4 files changed, 0 insertions, 21 deletions
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h
index 2ed34cd43e1..896d40df9a1 100644
--- a/drivers/net/qlcnic/qlcnic.h
+++ b/drivers/net/qlcnic/qlcnic.h
@@ -149,8 +149,6 @@
149#define get_next_index(index, length) \ 149#define get_next_index(index, length) \
150 (((index) + 1) & ((length) - 1)) 150 (((index) + 1) & ((length) - 1))
151 151
152#define MPORT_MULTI_FUNCTION_MODE 0x2222
153
154/* 152/*
155 * Following data structures describe the descriptors that will be used. 153 * Following data structures describe the descriptors that will be used.
156 * Added fileds of tcpHdrSize and ipHdrSize, The driver needs to do it only when 154 * 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 13740785d05..ad9d167723c 100644
--- a/drivers/net/qlcnic/qlcnic_hdr.h
+++ b/drivers/net/qlcnic/qlcnic_hdr.h
@@ -563,32 +563,16 @@ enum {
563#define CRB_PF_LINK_SPEED_1 (QLCNIC_REG(0xe8)) 563#define CRB_PF_LINK_SPEED_1 (QLCNIC_REG(0xe8))
564#define CRB_PF_LINK_SPEED_2 (QLCNIC_REG(0xec)) 564#define CRB_PF_LINK_SPEED_2 (QLCNIC_REG(0xec))
565 565
566#define CRB_MPORT_MODE (QLCNIC_REG(0xc4))
567#define CRB_DMA_SHIFT (QLCNIC_REG(0xcc))
568
569#define CRB_TEMP_STATE (QLCNIC_REG(0x1b4)) 566#define CRB_TEMP_STATE (QLCNIC_REG(0x1b4))
570 567
571#define CRB_V2P_0 (QLCNIC_REG(0x290)) 568#define CRB_V2P_0 (QLCNIC_REG(0x290))
572#define CRB_V2P(port) (CRB_V2P_0+((port)*4)) 569#define CRB_V2P(port) (CRB_V2P_0+((port)*4))
573#define CRB_DRIVER_VERSION (QLCNIC_REG(0x2a0)) 570#define CRB_DRIVER_VERSION (QLCNIC_REG(0x2a0))
574 571
575#define CRB_SW_INT_MASK_0 (QLCNIC_REG(0x1d8))
576#define CRB_SW_INT_MASK_1 (QLCNIC_REG(0x1e0))
577#define CRB_SW_INT_MASK_2 (QLCNIC_REG(0x1e4))
578#define CRB_SW_INT_MASK_3 (QLCNIC_REG(0x1e8))
579
580#define CRB_FW_CAPABILITIES_1 (QLCNIC_CAM_RAM(0x128)) 572#define CRB_FW_CAPABILITIES_1 (QLCNIC_CAM_RAM(0x128))
581#define CRB_MAC_BLOCK_START (QLCNIC_CAM_RAM(0x1c0)) 573#define CRB_MAC_BLOCK_START (QLCNIC_CAM_RAM(0x1c0))
582 574
583/* 575/*
584 * capabilities register, can be used to selectively enable/disable features
585 * for backward compability
586 */
587#define CRB_NIC_CAPABILITIES_HOST QLCNIC_REG(0x1a8)
588
589#define INTR_SCHEME_PERPORT 0x1
590
591/*
592 * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address 576 * CrbPortPhanCntrHi/Lo is used to pass the address of HostPhantomIndex address
593 * which can be read by the Phantom host to get producer/consumer indexes from 577 * which can be read by the Phantom host to get producer/consumer indexes from
594 * Phantom/Casper. If it is not HOST_SHARED_MEMORY, then the following 578 * Phantom/Casper. If it is not HOST_SHARED_MEMORY, then the following
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c
index dccd8c3d65e..71a4e664ad7 100644
--- 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)
1184 if (err) 1184 if (err)
1185 return err; 1185 return err;
1186 1186
1187 QLCWR32(adapter, CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT);
1188 QLCWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE);
1189 QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK); 1187 QLCWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK);
1190 1188
1191 return err; 1189 return err;
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index dde1e8aaf20..f8bd1bd29b4 100644
--- 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)
606 msleep(1); 606 msleep(1);
607 } 607 }
608 608
609 QLCWR32(adapter, CRB_DMA_SHIFT, 0x55555555);
610 QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS1, 0); 609 QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS1, 0);
611 QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS2, 0); 610 QLCWR32(adapter, QLCNIC_PEG_HALT_STATUS2, 0);
612 611