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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

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)
 {
         /* 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 */