Skip to content

Commit

Permalink
iwlwifi: rename iwl_remove to iwl_op_mode_dvm_stop
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Emmanuel Grumbach authored and Wey-Yi Guy committed Feb 27, 2012
1 parent 07590f0 commit 6459f98
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-agn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ int iwl_op_mode_dvm_start(struct iwl_bus *bus,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/iwlwifi/iwl-shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 6459f98

Please sign in to comment.