iwlwifi: move ucode_type from shared to op_mode

This variable holds the ucode currently
running on the device; which is determined by
op_mode, so move this parameter there.

Also, the name of the variable is a bit
misleading, so rename it to cur_ucode.

Signed-off-by: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ce41437f0ce0cae0b073ddd4f546b914e10b72ac..347613049141f67338d9f97833a0684d7783d95e 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1632,7 +1632,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
        struct iwl_error_event_table table;
 
        base = priv->device_pointers.error_event_table;
-       if (priv->shrd->ucode_type == IWL_UCODE_INIT) {
+       if (priv->cur_ucode == IWL_UCODE_INIT) {
                if (!base)
                        base = priv->shrd->fw->init_errlog_ptr;
        } else {
@@ -1644,7 +1644,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv)
                IWL_ERR(priv,
                        "Not valid error log pointer 0x%08X for %s uCode\n",
                        base,
-                       (priv->shrd->ucode_type == IWL_UCODE_INIT)
+                       (priv->cur_ucode == IWL_UCODE_INIT)
                                        ? "Init" : "RT");
                return;
        }
@@ -1723,7 +1723,7 @@ static int iwl_print_event_log(struct iwl_priv *priv, u32 start_idx,
                return pos;
 
        base = priv->device_pointers.log_event_table;
-       if (priv->shrd->ucode_type == IWL_UCODE_INIT) {
+       if (priv->cur_ucode == IWL_UCODE_INIT) {
                if (!base)
                        base = priv->shrd->fw->init_evtlog_ptr;
        } else {
@@ -1838,7 +1838,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
        struct iwl_trans *trans = trans(priv);
 
        base = priv->device_pointers.log_event_table;
-       if (priv->shrd->ucode_type == IWL_UCODE_INIT) {
+       if (priv->cur_ucode == IWL_UCODE_INIT) {
                logsize = priv->shrd->fw->init_evtlog_size;
                if (!base)
                        base = priv->shrd->fw->init_evtlog_ptr;
@@ -1852,7 +1852,7 @@ int iwl_dump_nic_event_log(struct iwl_priv *priv, bool full_log,
                IWL_ERR(priv,
                        "Invalid event log pointer 0x%08X for %s uCode\n",
                        base,
-                       (priv->shrd->ucode_type == IWL_UCODE_INIT)
+                       (priv->cur_ucode == IWL_UCODE_INIT)
                                        ? "Init" : "RT");
                return -EINVAL;
        }

diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index d4b51a5855a1c8f3c44f4a1f35d574cd1f008e18..a2baf17565204d7f141dd0394adea31c920ed98f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -240,7 +240,7 @@ static ssize_t iwl_dbgfs_sram_read(struct file *file,
                        IWL_ERR(priv, "No uCode has been loadded.\n");
                        return -EINVAL;
                }
-               img = &priv->fw->img[priv->shrd->ucode_type];
+               img = &priv->fw->img[priv->cur_ucode];
                priv->dbgfs_sram_len = img->sec[IWL_UCODE_SECTION_DATA].len;
        }
        len = priv->dbgfs_sram_len;

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 2f54c9baa3dfe95206e43e774aa209de22d20896..99be58940e275128a2f17bad4059dd5a33d734bd 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -997,6 +997,9 @@ struct iwl_priv {
                u32 error_event_table;
                u32 log_event_table;
        } device_pointers;
+
+       /* indicator of loaded ucode image */
+       enum iwl_ucode_type cur_ucode;
 }; /*iwl_priv */
 
 extern struct kmem_cache *iwl_tx_cmd_pool;

diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h
index ef3f0b9064a8c6081ae70ea246d1922a50664abf..90f464e4e88d7560632f30be65b5d5c7267f9f86 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-shared.h
+++ b/drivers/net/wireless/iwlwifi/iwl-shared.h
@@ -346,7 +346,6 @@ struct iwl_cfg {
  * @hw_params: see struct iwl_hw_params
  * @lock: protect general shared data
  * @eeprom: pointer to the eeprom/OTP image
- * @ucode_type: indicator of loaded ucode image
  */
 struct iwl_shared {
        unsigned long status;
@@ -360,9 +359,6 @@ struct iwl_shared {
        /* eeprom -- this is in the card's little endian byte order */
        u8 *eeprom;
 
-       /* ucode related variables */
-       enum iwl_ucode_type ucode_type;
-
 };
 
 /*Whatever _m is (iwl_trans, iwl_priv, these macros will work */

diff --git a/drivers/net/wireless/iwlwifi/iwl-testmode.c b/drivers/net/wireless/iwlwifi/iwl-testmode.c
index 645b8500d02fbbc18eaf7f25565e981a5748032a..d65dac88e1902ec9602bc8ccafa9b64cb89d2fa2 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@ -601,11 +601,11 @@ static int iwl_testmode_driver(struct ieee80211_hw *hw, struct nlattr **tb)
                        IWL_ERR(priv, "No uCode has not been loaded\n");
                        return -EINVAL;
                } else {
-                       img = &priv->fw->img[priv->shrd->ucode_type];
+                       img = &priv->fw->img[priv->cur_ucode];
                        inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
                        data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
                }
-               NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type);
+               NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
                NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
                status = cfg80211_testmode_reply(skb);

diff --git a/drivers/net/wireless/iwlwifi/iwl-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 993f1a3a0078522425a6e809444b8b38c320d7ed..ba7c9f883cb6804f68bdc032a546f85ded1e40d6 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c
@@ -391,8 +391,8 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
        enum iwl_ucode_type old_type;
        static const u8 alive_cmd[] = { REPLY_ALIVE };
 
-       old_type = priv->shrd->ucode_type;
-       priv->shrd->ucode_type = ucode_type;
+       old_type = priv->cur_ucode;
+       priv->cur_ucode = ucode_type;
        fw = iwl_get_ucode_image(priv, ucode_type);
 
        priv->ucode_loaded = false;
@@ -406,7 +406,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
 
        ret = iwl_trans_start_fw(trans(priv), fw);
        if (ret) {
-               priv->shrd->ucode_type = old_type;
+               priv->cur_ucode = old_type;
                iwl_remove_notification(&priv->notif_wait, &alive_wait);
                return ret;
        }
@@ -418,13 +418,13 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
        ret = iwl_wait_notification(&priv->notif_wait, &alive_wait,
                                        UCODE_ALIVE_TIMEOUT);
        if (ret) {
-               priv->shrd->ucode_type = old_type;
+               priv->cur_ucode = old_type;
                return ret;
        }
 
        if (!alive_data.valid) {
                IWL_ERR(priv, "Loaded ucode is not valid!\n");
-               priv->shrd->ucode_type = old_type;
+               priv->cur_ucode = old_type;
                return -EIO;
        }
 
@@ -436,7 +436,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
        if (ucode_type != IWL_UCODE_WOWLAN) {
                ret = iwl_verify_ucode(priv, ucode_type);
                if (ret) {
-                       priv->shrd->ucode_type = old_type;
+                       priv->cur_ucode = old_type;
                        return ret;
                }
 
@@ -448,7 +448,7 @@ int iwl_load_ucode_wait_alive(struct iwl_priv *priv,
        if (ret) {
                IWL_WARN(priv,
                        "Could not complete ALIVE transition: %d\n", ret);
-               priv->shrd->ucode_type = old_type;
+               priv->cur_ucode = old_type;
                return ret;
        }