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

Commit 83ed9015 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlagn: all function iwl-io.c receive iwl_bus 



Which means that iwl-io.c doesn't need to include iwl-dev.h any more.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a72b8b08

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

+2 −2
Original line number Diff line number Diff line
@@ -85,13 +85,13 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv) 
static void iwl1000_nic_config(struct iwl_priv *priv)

{

	/* set CSR_HW_CONFIG_REG for uCode use */

	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

	iwl_set_bit(bus(priv), CSR_HW_IF_CONFIG_REG,

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);



	/* Setting digital SVR for 1000 card to 1.32V */

	/* locking is acquired in iwl_set_bits_mask_prph() function */

	iwl_set_bits_mask_prph(priv, APMG_DIGITAL_SVR_REG,

	iwl_set_bits_mask_prph(bus(priv), APMG_DIGITAL_SVR_REG,

				APMG_SVR_DIGITAL_VOLTAGE_1_32,

				~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void iwl2000_nic_config(struct iwl_priv *priv) 
	iwl_rf_config(priv);



	if (priv->cfg->iq_invert)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

			    CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void iwl5000_nic_config(struct iwl_priv *priv) 
	 * (PCIe power is lost before PERST# is asserted),

	 * causing ME FW to lose ownership and not being able to obtain it back.

	 */

	iwl_set_bits_mask_prph(priv, APMG_PS_CTRL_REG,

	iwl_set_bits_mask_prph(bus(priv), APMG_PS_CTRL_REG,

				APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,

				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);

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

+4 −4
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void iwl6050_additional_nic_config(struct iwl_priv *priv) 
{

	/* Indicate calibration version to uCode. */

	if (iwlagn_eeprom_calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

}
@@ -91,9 +91,9 @@ static void iwl6150_additional_nic_config(struct iwl_priv *priv) 
{

	/* Indicate calibration version to uCode. */

	if (iwlagn_eeprom_calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

		iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(priv, CSR_GP_DRIVER_REG,

	iwl_set_bit(bus(priv), CSR_GP_DRIVER_REG,

		    CSR_GP_DRIVER_REG_BIT_6050_1x2);

}
@@ -105,7 +105,7 @@ static void iwl6000_nic_config(struct iwl_priv *priv) 
	/* no locking required for register write */

	if (priv->cfg->pa_type == IWL_PA_INTERNAL) {

		/* 2x2 IPA phy type */

		iwl_write32(priv, CSR_GP_DRIVER_REG,

		iwl_write32(bus(priv), CSR_GP_DRIVER_REG,

			     CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);

	}

	/* do additional nic configuration if needed */

drivers/net/wireless/iwlwifi/iwl-agn-tt.c

+7 −7
Original line number Diff line number Diff line
@@ -181,19 +181,19 @@ static void iwl_tt_check_exit_ct_kill(unsigned long data) 


	if (tt->state == IWL_TI_CT_KILL) {

		if (priv->thermal_throttle.ct_kill_toggle) {

			iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,

			iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_CLR,

				    CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);

			priv->thermal_throttle.ct_kill_toggle = false;

		} else {

			iwl_write32(priv, CSR_UCODE_DRV_GP1_SET,

			iwl_write32(bus(priv), CSR_UCODE_DRV_GP1_SET,

				    CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);

			priv->thermal_throttle.ct_kill_toggle = true;

		}

		iwl_read32(priv, CSR_UCODE_DRV_GP1);

		spin_lock_irqsave(&priv->reg_lock, flags);

		if (!iwl_grab_nic_access(priv))

			iwl_release_nic_access(priv);

		spin_unlock_irqrestore(&priv->reg_lock, flags);

		iwl_read32(bus(priv), CSR_UCODE_DRV_GP1);

		spin_lock_irqsave(&bus(priv)->reg_lock, flags);

		if (!iwl_grab_nic_access(bus(priv)))

			iwl_release_nic_access(bus(priv));

		spin_unlock_irqrestore(&bus(priv)->reg_lock, flags);



		/* Reschedule the ct_kill timer to occur in

		 * CT_KILL_EXIT_DURATION seconds to ensure we get a