iwlwifi: rename iwl_remove to iwl_op_mode_dvm_stop
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 9 Feb 2012 09:46:06 +0000 (11:46 +0200)
committerWey-Yi Guy <wey-yi.w.guy@intel.com>
Mon, 27 Feb 2012 21:25:47 +0000 (13:25 -0800)
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>
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-drv.c
drivers/net/wireless/iwlwifi/iwl-shared.h

index 8bb97c9..09f343c 100644 (file)
@@ -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);
 
index b3876de..db430c7 100644 (file)
@@ -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);
 }
index d84beef..392b33a 100644 (file)
@@ -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,