aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-6000.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-6000.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
index 63089bc28d9c..955a99cef949 100644
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@ -83,7 +83,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv)
83{ 83{
84 /* Indicate calibration version to uCode. */ 84 /* Indicate calibration version to uCode. */
85 if (iwlagn_eeprom_calib_version(priv) >= 6) 85 if (iwlagn_eeprom_calib_version(priv) >= 6)
86 iwl_set_bit(priv, CSR_GP_DRIVER_REG, 86 iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
87 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); 87 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
88} 88}
89 89
@@ -91,9 +91,9 @@ static void iwl6150_additional_nic_config(struct iwl_priv *priv)
91{ 91{
92 /* Indicate calibration version to uCode. */ 92 /* Indicate calibration version to uCode. */
93 if (iwlagn_eeprom_calib_version(priv) >= 6) 93 if (iwlagn_eeprom_calib_version(priv) >= 6)
94 iwl_set_bit(priv, CSR_GP_DRIVER_REG, 94 iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
95 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); 95 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
96 iwl_set_bit(priv, CSR_GP_DRIVER_REG, 96 iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,
97 CSR_GP_DRIVER_REG_BIT_6050_1x2); 97 CSR_GP_DRIVER_REG_BIT_6050_1x2);
98} 98}
99 99
@@ -105,7 +105,7 @@ static void iwl6000_nic_config(struct iwl_priv *priv)
105 /* no locking required for register write */ 105 /* no locking required for register write */
106 if (priv->cfg->pa_type == IWL_PA_INTERNAL) { 106 if (priv->cfg->pa_type == IWL_PA_INTERNAL) {
107 /* 2x2 IPA phy type */ 107 /* 2x2 IPA phy type */
108 iwl_write32(priv, CSR_GP_DRIVER_REG, 108 iwl_write32(bus(priv), CSR_GP_DRIVER_REG,
109 CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA); 109 CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
110 } 110 }
111 /* do additional nic configuration if needed */ 111 /* do additional nic configuration if needed */