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>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 8bb97c91b10215e85d8fa6d7226a6c2ec1f71f80..09f343cd405ebebb9515451b9bc203a6c4cc3384 100644 (file)
--- 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 b3876dec52af85f79fc117dc5f5ed97ceb2acdb2..db430c7d27d71d1dc5fb493fcbc4ba10fb315caf 100644 (file)
--- 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 d84beef10bdd2f00d24c021b1281b84285534489..392b33a594100a7008f13ecef5fb788a6d733e32 100644 (file)
--- 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,