Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6459f987 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Wey-Yi Guy
Browse files

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: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 07590f08

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlwifi/iwl-drv.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/net/wireless/iwlwifi/iwl-shared.h

+1 −1
Original line number Diff line number Diff line
@@ -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,