AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-06 15:45:08 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: remove twice defined CSR register

Browse Source 
This patch removes twice defined CSR register. It was confusing

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Tomas Winkler 2008-02-19 14:05:33 -08:00 committed by John W. Linville
parent 4a9a66e9a8
commit 9f6adf23d8
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/iwlwifi/iwl-3945-hw.h
View File

@ -324,7 +324,6 @@ struct iwl3945_eeprom {
/*=== CSR (control and status registers) ===*/ /*=== CSR (control and status registers) ===*/
#define CSR_BASE (0x000) #define CSR_BASE (0x000)
#define CSR_SW_VER (CSR_BASE+0x000)
#define CSR_HW_IF_CONFIG_REG (CSR_BASE+0x000) /* hardware interface config */ #define CSR_HW_IF_CONFIG_REG (CSR_BASE+0x000) /* hardware interface config */
#define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */ #define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */
#define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */ #define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */

1
drivers/net/wireless/iwlwifi/iwl-4965-hw.h
View File

@ -413,7 +413,6 @@ struct iwl4965_eeprom {
/*=== CSR (control and status registers) ===*/ /*=== CSR (control and status registers) ===*/
#define CSR_BASE (0x000) #define CSR_BASE (0x000)
#define CSR_SW_VER (CSR_BASE+0x000)
#define CSR_HW_IF_CONFIG_REG (CSR_BASE+0x000) /* hardware interface config */ #define CSR_HW_IF_CONFIG_REG (CSR_BASE+0x000) /* hardware interface config */
#define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */ #define CSR_INT_COALESCING (CSR_BASE+0x004) /* accum ints, 32-usec units */
#define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */ #define CSR_INT (CSR_BASE+0x008) /* host interrupt status/ack */

7
drivers/net/wireless/iwlwifi/iwl-4965.c
View File

@ -545,9 +545,10 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv)
/* set CSR_HW_CONFIG_REG for uCode use */ /* set CSR_HW_CONFIG_REG for uCode use */
iwl4965_set_bit(priv, CSR_SW_VER, CSR_HW_IF_CONFIG_REG_BIT_KEDRON_R | iwl4965_set_bit(priv, CSR_HW_IF_CONFIG_REG,
CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | CSR_HW_IF_CONFIG_REG_BIT_KEDRON_R |
CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
rc = iwl4965_grab_nic_access(priv); rc = iwl4965_grab_nic_access(priv);
if (rc < 0) { if (rc < 0) {