diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2012-02-09 09:46:06 (GMT) |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-02-27 21:25:47 (GMT) |
| commit | 6459f9871a1218f7a2e6385d1ae6c91e91f9d251 (patch) | |
| tree | 1277a68d40542771b8c64bcb364ddf16e341f326 | |
| parent | 07590f080d5f29e33158b22f7ad6079b85d87609 (diff) | |
| download | linux-fsl-qoriq-6459f9871a1218f7a2e6385d1ae6c91e91f9d251.tar.xz | |
iwlwifi: rename iwl_remove to iwl_op_mode_dvm_stop
iwl_remove stops the wifi flows, so rename.
Moreover, we can possibly stop the wifi flows even if the driver
is statically compiled in the kernel, so remove the __devexit pragma.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-drv.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 8bb97c9..09f343c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -1331,7 +1331,7 @@ out: return err; } -void __devexit iwl_remove(struct iwl_priv * priv) +void iwl_op_mode_dvm_stop(struct iwl_priv *priv) { wait_for_completion(&nic(priv)->request_firmware_complete); diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c index b3876de..db430c7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/drivers/net/wireless/iwlwifi/iwl-drv.c @@ -94,7 +94,7 @@ int iwl_drv_start(struct iwl_shared *shrd, void iwl_drv_stop(struct iwl_shared *shrd) { - iwl_remove(shrd->priv); + iwl_op_mode_dvm_stop(shrd->priv); kfree(shrd->nic); } diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index d84beef..392b33a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -535,7 +535,7 @@ enum iwl_rxon_context_id { int iwl_op_mode_dvm_start(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, struct iwl_cfg *cfg); -void __devexit iwl_remove(struct iwl_priv * priv); +void iwl_op_mode_dvm_stop(struct iwl_priv *priv); struct iwl_device_cmd; int __must_check iwl_rx_dispatch(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb, |