summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-03-06 13:30:36 -0800
committerJohn W. Linville <linville@tuxdriver.com>2012-03-07 13:51:47 -0500
commite19918855dc4822a24787a6d0048205b011e5ecb (patch)
treec4c73413748f42dfb3fe6d451f1d12166b7965d7 /drivers/net/wireless/iwlwifi/iwl-agn-lib.c
parent3d4f96997263d97cd4d60373f1ed8184ee6df31b (diff)
downloadop-kernel-dev-e19918855dc4822a24787a6d0048205b011e5ecb.zip
op-kernel-dev-e19918855dc4822a24787a6d0048205b011e5ecb.tar.gz
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>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-lib.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index e96af51..45b060a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1195,7 +1195,7 @@ int iwlagn_suspend(struct iwl_priv *priv,
priv->wowlan = true;
- ret = iwl_load_ucode_wait_alive(trans(priv), IWL_UCODE_WOWLAN);
+ ret = iwl_load_ucode_wait_alive(priv, IWL_UCODE_WOWLAN);
if (ret)
goto out;
OpenPOWER on IntegriCloud