diff options
author | Don Fry <donald.h.fry@intel.com> | 2012-02-06 19:00:14 -0500 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-17 13:28:06 -0500 |
commit | 96502ceb1c122cf5496c9176bb690a52b3fab362 (patch) | |
tree | eca2439d4a72c7e2ec7330bc50ce9cc6c8fe66d8 /drivers/net/wireless/iwlwifi | |
parent | 737805ff7a15105b77d83c7c3b17fa0868cb864e (diff) |
iwlwifi: move firmware_loading_complete to iwl_nic
Move firmware_loading_complete from iwl_priv to iwl_nic and rename it
to more accurately reflect what it does.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-ucode.c | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 9e902f7e9d3..12803d3fb2f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -1273,7 +1273,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, | |||
1273 | iwl_power_initialize(priv); | 1273 | iwl_power_initialize(priv); |
1274 | iwl_tt_initialize(priv); | 1274 | iwl_tt_initialize(priv); |
1275 | 1275 | ||
1276 | init_completion(&priv->firmware_loading_complete); | 1276 | init_completion(&nic(priv)->request_firmware_complete); |
1277 | 1277 | ||
1278 | err = iwl_request_firmware(priv, true); | 1278 | err = iwl_request_firmware(priv, true); |
1279 | if (err) | 1279 | if (err) |
@@ -1296,7 +1296,7 @@ out: | |||
1296 | 1296 | ||
1297 | void __devexit iwl_remove(struct iwl_priv * priv) | 1297 | void __devexit iwl_remove(struct iwl_priv * priv) |
1298 | { | 1298 | { |
1299 | wait_for_completion(&priv->firmware_loading_complete); | 1299 | wait_for_completion(&nic(priv)->request_firmware_complete); |
1300 | 1300 | ||
1301 | IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n"); | 1301 | IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n"); |
1302 | 1302 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index 33210100635..0d0b4bb9dc6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
@@ -864,8 +864,6 @@ struct iwl_priv { | |||
864 | struct iwl_rx_phy_res last_phy_res; | 864 | struct iwl_rx_phy_res last_phy_res; |
865 | bool last_phy_res_valid; | 865 | bool last_phy_res_valid; |
866 | 866 | ||
867 | struct completion firmware_loading_complete; | ||
868 | |||
869 | u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr; | 867 | u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr; |
870 | u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr; | 868 | u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr; |
871 | 869 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c index 0ba8ea91027..51a8fb353a6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-ucode.c +++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c | |||
@@ -1273,7 +1273,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) | |||
1273 | 1273 | ||
1274 | /* We have our copies now, allow OS release its copies */ | 1274 | /* We have our copies now, allow OS release its copies */ |
1275 | release_firmware(ucode_raw); | 1275 | release_firmware(ucode_raw); |
1276 | complete(&priv->firmware_loading_complete); | 1276 | complete(&nic->request_firmware_complete); |
1277 | return; | 1277 | return; |
1278 | 1278 | ||
1279 | try_again: | 1279 | try_again: |
@@ -1287,7 +1287,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) | |||
1287 | IWL_ERR(priv, "failed to allocate pci memory\n"); | 1287 | IWL_ERR(priv, "failed to allocate pci memory\n"); |
1288 | iwl_dealloc_ucode(trans(priv)); | 1288 | iwl_dealloc_ucode(trans(priv)); |
1289 | out_unbind: | 1289 | out_unbind: |
1290 | complete(&priv->firmware_loading_complete); | 1290 | complete(&nic->request_firmware_complete); |
1291 | device_release_driver(trans(priv)->dev); | 1291 | device_release_driver(trans(priv)->dev); |
1292 | release_firmware(ucode_raw); | 1292 | release_firmware(ucode_raw); |
1293 | } | 1293 | } |