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

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

iwlwifi: remove 49 prefix from general CSR values 



This patch change CSR49_ to CSR_ for values used in
other HW

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b0692f2f

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

+2 −2
Original line number Diff line number Diff line
@@ -618,8 +618,8 @@ int iwl4965_hw_nic_init(struct iwl_priv *priv) 


	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

		    CSR49_HW_IF_CONFIG_REG_BIT_4965_R |

		    CSR49_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR49_HW_IF_CONFIG_REG_BIT_MAC_SI);

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);



	ret = iwl_grab_nic_access(priv);

	if (ret < 0) {

drivers/net/wireless/iwlwifi/iwl-csr.h

+3 −3
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ 


/* Bits for CSR_HW_IF_CONFIG_REG */

#define CSR49_HW_IF_CONFIG_REG_BIT_4965_R	(0x00000010)

#define CSR49_HW_IF_CONFIG_REG_MSK_BOARD_VER	(0x00000C00)

#define CSR49_HW_IF_CONFIG_REG_BIT_MAC_SI		(0x00000100)

#define CSR49_HW_IF_CONFIG_REG_BIT_RADIO_SI	(0x00000200)

#define CSR_HW_IF_CONFIG_REG_MSK_BOARD_VER	(0x00000C00)

#define CSR_HW_IF_CONFIG_REG_BIT_MAC_SI 	(0x00000100)

#define CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI	(0x00000200)



#define CSR39_HW_IF_CONFIG_REG_BIT_3945_MB         (0x00000100)

#define CSR39_HW_IF_CONFIG_REG_BIT_3945_MM         (0x00000200)