Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f6adf23 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: remove twice defined CSR register 



This patch removes twice defined CSR register. It was confusing

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4a9a66e9

drivers/net/wireless/iwlwifi/iwl-3945-hw.h

+0 −1
Original line number Diff line number Diff line
@@ -324,7 +324,6 @@ struct iwl3945_eeprom { 
/*=== CSR (control and status registers) ===*/

#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_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */

#define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */

drivers/net/wireless/iwlwifi/iwl-4965-hw.h

+0 −1
Original line number Diff line number Diff line
@@ -413,7 +413,6 @@ struct iwl4965_eeprom { 
/*=== CSR (control and status registers) ===*/

#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_INT_COALESCING      (CSR_BASE+0x004) /* accum ints, 32-usec units */

#define CSR_INT                 (CSR_BASE+0x008) /* host interrupt status/ack */

drivers/net/wireless/iwlwifi/iwl-4965.c

+4 −3
Original line number Diff line number Diff line
@@ -545,7 +545,8 @@ int iwl4965_hw_nic_init(struct iwl4965_priv *priv) 


	/* 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_KEDRON_R |

			CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

			CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);