aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-devices.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-devices.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c b/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
index 08718caf4aa9..ae4a21620c4f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-devices.c
@@ -60,13 +60,13 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv)
60static void iwl1000_nic_config(struct iwl_priv *priv) 60static void iwl1000_nic_config(struct iwl_priv *priv)
61{ 61{
62 /* set CSR_HW_CONFIG_REG for uCode use */ 62 /* set CSR_HW_CONFIG_REG for uCode use */
63 iwl_set_bit(trans(priv), CSR_HW_IF_CONFIG_REG, 63 iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
64 CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI | 64 CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
65 CSR_HW_IF_CONFIG_REG_BIT_MAC_SI); 65 CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
66 66
67 /* Setting digital SVR for 1000 card to 1.32V */ 67 /* Setting digital SVR for 1000 card to 1.32V */
68 /* locking is acquired in iwl_set_bits_mask_prph() function */ 68 /* locking is acquired in iwl_set_bits_mask_prph() function */
69 iwl_set_bits_mask_prph(trans(priv), APMG_DIGITAL_SVR_REG, 69 iwl_set_bits_mask_prph(priv->trans, APMG_DIGITAL_SVR_REG,
70 APMG_SVR_DIGITAL_VOLTAGE_1_32, 70 APMG_SVR_DIGITAL_VOLTAGE_1_32,
71 ~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK); 71 ~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);
72} 72}
@@ -222,7 +222,7 @@ static void iwl2000_nic_config(struct iwl_priv *priv)
222{ 222{
223 iwl_rf_config(priv); 223 iwl_rf_config(priv);
224 224
225 iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG, 225 iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
226 CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER); 226 CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);
227} 227}
228 228
@@ -318,7 +318,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv)
318 * (PCIe power is lost before PERST# is asserted), 318 * (PCIe power is lost before PERST# is asserted),
319 * causing ME FW to lose ownership and not being able to obtain it back. 319 * causing ME FW to lose ownership and not being able to obtain it back.
320 */ 320 */
321 iwl_set_bits_mask_prph(trans(priv), APMG_PS_CTRL_REG, 321 iwl_set_bits_mask_prph(priv->trans, APMG_PS_CTRL_REG,
322 APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS, 322 APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
323 ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS); 323 ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
324} 324}
@@ -580,21 +580,21 @@ static void iwl6000_nic_config(struct iwl_priv *priv)
580 break; 580 break;
581 case IWL_DEVICE_FAMILY_6000i: 581 case IWL_DEVICE_FAMILY_6000i:
582 /* 2x2 IPA phy type */ 582 /* 2x2 IPA phy type */
583 iwl_write32(trans(priv), CSR_GP_DRIVER_REG, 583 iwl_write32(priv->trans, CSR_GP_DRIVER_REG,
584 CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA); 584 CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);
585 break; 585 break;
586 case IWL_DEVICE_FAMILY_6050: 586 case IWL_DEVICE_FAMILY_6050:
587 /* Indicate calibration version to uCode. */ 587 /* Indicate calibration version to uCode. */
588 if (iwl_eeprom_calib_version(priv) >= 6) 588 if (iwl_eeprom_calib_version(priv) >= 6)
589 iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG, 589 iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
590 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); 590 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
591 break; 591 break;
592 case IWL_DEVICE_FAMILY_6150: 592 case IWL_DEVICE_FAMILY_6150:
593 /* Indicate calibration version to uCode. */ 593 /* Indicate calibration version to uCode. */
594 if (iwl_eeprom_calib_version(priv) >= 6) 594 if (iwl_eeprom_calib_version(priv) >= 6)
595 iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG, 595 iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
596 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6); 596 CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);
597 iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG, 597 iwl_set_bit(priv->trans, CSR_GP_DRIVER_REG,
598 CSR_GP_DRIVER_REG_BIT_6050_1x2); 598 CSR_GP_DRIVER_REG_BIT_6050_1x2);
599 break; 599 break;
600 default: 600 default: