iwlwifi: move firmware_name to iwl_nic

Delete firmware_name from iwl_priv and use iwl_nic instead.

Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 008287f08d7575bea0f9ada371cf59845c8410a7..332101006353d6191fd960ac67c88560a7f71bf4 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -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;

diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index c3ac2cc7a795146b8eb478023316b9bea2453211..0ba8ea91027409f9daaebb699dc8d24ac5960c43 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -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) {