Commit 96502ceb authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy
Browse files

iwlwifi: move firmware_loading_complete to iwl_nic 



Move firmware_loading_complete from iwl_priv to iwl_nic and rename it
to more accurately reflect what it does.

Signed-off-by: default avatarDon Fry <donald.h.fry@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 737805ff

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

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 
	iwl_power_initialize(priv);

	iwl_tt_initialize(priv);



	init_completion(&priv->firmware_loading_complete);

	init_completion(&nic(priv)->request_firmware_complete);



	err = iwl_request_firmware(priv, true);

	if (err)
@@ -1296,7 +1296,7 @@ int iwl_probe(struct iwl_bus *bus, const struct iwl_trans_ops *trans_ops, 


void __devexit iwl_remove(struct iwl_priv * priv)

{

	wait_for_completion(&priv->firmware_loading_complete);

	wait_for_completion(&nic(priv)->request_firmware_complete);



	IWL_DEBUG_INFO(priv, "*** UNLOAD DRIVER ***\n");

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

+0 −2
Original line number Diff line number Diff line
@@ -864,8 +864,6 @@ struct iwl_priv { 
	struct iwl_rx_phy_res last_phy_res;

	bool last_phy_res_valid;



	struct completion firmware_loading_complete;



	u32 init_evtlog_ptr, init_evtlog_size, init_errlog_ptr;

	u32 inst_evtlog_ptr, inst_evtlog_size, inst_errlog_ptr;

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

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 


	/* We have our copies now, allow OS release its copies */

	release_firmware(ucode_raw);

	complete(&priv->firmware_loading_complete);

	complete(&nic->request_firmware_complete);

	return;



 try_again:
@@ -1287,7 +1287,7 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
	IWL_ERR(priv, "failed to allocate pci memory\n");

	iwl_dealloc_ucode(trans(priv));

 out_unbind:

	complete(&priv->firmware_loading_complete);

	complete(&nic->request_firmware_complete);

	device_release_driver(trans(priv)->dev);

	release_firmware(ucode_raw);

}