iwlwifi: move ucode loading to op_mode

uCode loading belongs to the op_mode, as it
is dependent on various things there and the
commands sent during it are specific to it.
Move the prototypes to iwl-agn.h to indicate
this. To make this possible, also move all
the calibration handling (which is op_mode
dependent after all).

Signed-off-by: Johannes Berg <johannes.berg@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, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 7f937151a8af..37330addce79 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -278,13 +278,13 @@ static int __iwl_up(struct iwl_priv *priv)
                 }
         }
 
-        ret = iwl_run_init_ucode(trans(priv));
+        ret = iwl_run_init_ucode(priv);
         if (ret) {
                 IWL_ERR(priv, "Failed to run INIT ucode: %d\n", ret);
                 goto error;
         }
 
-        ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_REGULAR);
+        ret = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR);
         if (ret) {
                 IWL_ERR(priv, "Failed to start RT ucode: %d\n", ret);
                 goto error;