Commit 737805ff authored by Don Fry's avatar Don Fry Committed by Wey-Yi Guy
Browse files

iwlwifi: move firmware_name to iwl_nic 



Delete firmware_name from iwl_priv and use iwl_nic instead.

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 f6fd51d9

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

+0 −3
Original line number Diff line number Diff line
@@ -787,9 +787,6 @@ struct iwl_priv { 
	/* EEPROM MAC addresses */

	struct mac_address addresses[2];



	/* uCode images, save to reload in case of failure */

	char firmware_name[25];



	struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];



	__le16 switch_channel;

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

+5 −5
Original line number Diff line number Diff line
@@ -712,14 +712,14 @@ int __must_check iwl_request_firmware(struct iwl_priv *priv, bool first) 
		return -ENOENT;

	}



	sprintf(priv->firmware_name, "%s%s%s", name_pre, tag, ".ucode");

	sprintf(nic->firmware_name, "%s%s%s", name_pre, tag, ".ucode");



	IWL_DEBUG_INFO(priv, "attempting to load firmware %s'%s'\n",

		       (nic->fw_index == UCODE_EXPERIMENTAL_INDEX)

				? "EXPERIMENTAL " : "",

		       priv->firmware_name);

		       nic->firmware_name);



	return request_firmware_nowait(THIS_MODULE, 1, priv->firmware_name,

	return request_firmware_nowait(THIS_MODULE, 1, nic->firmware_name,

				       trans(priv)->dev,

				       GFP_KERNEL, priv, iwl_ucode_callback);

}
@@ -1036,12 +1036,12 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) 
		if (nic->fw_index <= api_ok)

			IWL_ERR(priv,

				"request for firmware file '%s' failed.\n",

				priv->firmware_name);

				nic->firmware_name);

		goto try_again;

	}



	IWL_DEBUG_INFO(priv, "Loaded firmware file '%s' (%zd bytes).\n",

		       priv->firmware_name, ucode_raw->size);

		       nic->firmware_name, ucode_raw->size);



	/* Make sure that we got at least the API version number */

	if (ucode_raw->size < 4) {