diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 16:30:36 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:51:47 -0500 |
commit | e19918855dc4822a24787a6d0048205b011e5ecb (patch) | |
tree | c4c73413748f42dfb3fe6d451f1d12166b7965d7 /drivers/net/wireless/iwlwifi/iwl-testmode.c | |
parent | 3d4f96997263d97cd4d60373f1ed8184ee6df31b (diff) |
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-testmode.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-testmode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c index b24b166a9482..ec803ea08675 100644 --- a/drivers/net/wireless/iwlwifi/iwl-testmode.c +++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c | |||
@@ -422,7 +422,7 @@ static int iwl_testmode_cfg_init_calib(struct iwl_priv *priv) | |||
422 | iwl_init_notification_wait(priv->shrd, &calib_wait, | 422 | iwl_init_notification_wait(priv->shrd, &calib_wait, |
423 | CALIBRATION_COMPLETE_NOTIFICATION, | 423 | CALIBRATION_COMPLETE_NOTIFICATION, |
424 | NULL, NULL); | 424 | NULL, NULL); |
425 | ret = iwl_init_alive_start(trans(priv)); | 425 | ret = iwl_init_alive_start(priv); |
426 | if (ret) { | 426 | if (ret) { |
427 | IWL_ERR(priv, "Fail init calibration: %d\n", ret); | 427 | IWL_ERR(priv, "Fail init calibration: %d\n", ret); |
428 | goto cfg_init_calib_error; | 428 | goto cfg_init_calib_error; |
@@ -484,7 +484,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) | |||
484 | break; | 484 | break; |
485 | 485 | ||
486 | case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW: | 486 | case IWL_TM_CMD_APP2DEV_LOAD_INIT_FW: |
487 | status = iwl_load_ucode_wait_alive(trans, IWL_UCODE_INIT); | 487 | status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_INIT); |
488 | if (status) | 488 | if (status) |
489 | IWL_ERR(priv, "Error loading init ucode: %d\n", status); | 489 | IWL_ERR(priv, "Error loading init ucode: %d\n", status); |
490 | break; | 490 | break; |
@@ -495,7 +495,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) | |||
495 | break; | 495 | break; |
496 | 496 | ||
497 | case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW: | 497 | case IWL_TM_CMD_APP2DEV_LOAD_RUNTIME_FW: |
498 | status = iwl_load_ucode_wait_alive(trans, IWL_UCODE_REGULAR); | 498 | status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_REGULAR); |
499 | if (status) { | 499 | if (status) { |
500 | IWL_ERR(priv, | 500 | IWL_ERR(priv, |
501 | "Error loading runtime ucode: %d\n", status); | 501 | "Error loading runtime ucode: %d\n", status); |
@@ -510,7 +510,7 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb) | |||
510 | case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: | 510 | case IWL_TM_CMD_APP2DEV_LOAD_WOWLAN_FW: |
511 | iwl_scan_cancel_timeout(priv, 200); | 511 | iwl_scan_cancel_timeout(priv, 200); |
512 | iwl_trans_stop_device(trans); | 512 | iwl_trans_stop_device(trans); |
513 | status = iwl_load_ucode_wait_alive(trans, IWL_UCODE_WOWLAN); | 513 | status = iwl_load_ucode_wait_alive(priv, IWL_UCODE_WOWLAN); |
514 | if (status) { | 514 | if (status) { |
515 | IWL_ERR(priv, | 515 | IWL_ERR(priv, |
516 | "Error loading WOWLAN ucode: %d\n", status); | 516 | "Error loading WOWLAN ucode: %d\n", status); |