lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: rename iwl_remove to iwl_op_mode_dvm_stop

Browse Source 
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>
This commit is contained in:
Emmanuel Grumbach
2012-02-09 11:46:06 +02:00
committed by Wey-Yi Guy
parent 07590f080d
commit 6459f9871a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -1331,7 +1331,7 @@ out:
return err; 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); wait_for_completion(&nic(priv)->request_firmware_complete);

2
drivers/net/wireless/iwlwifi/iwl-drv.c
View File

@@ -94,7 +94,7 @@ int iwl_drv_start(struct iwl_shared *shrd,
void iwl_drv_stop(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); kfree(shrd->nic);
} }

2
drivers/net/wireless/iwlwifi/iwl-shared.h
View File

@@ -535,7 +535,7 @@ enum iwl_rxon_context_id {
int iwl_op_mode_dvm_start(struct iwl_bus *bus, int iwl_op_mode_dvm_start(struct iwl_bus *bus,
const struct iwl_trans_ops *trans_ops, const struct iwl_trans_ops *trans_ops,
struct iwl_cfg *cfg); 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; struct iwl_device_cmd;
int __must_check iwl_rx_dispatch(struct iwl_priv *priv, int __must_check iwl_rx_dispatch(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb, struct iwl_rx_mem_buffer *rxb,