iwlwifi: Move ucode pointers to iwl_fw

The ucode image is a ucode related thing not a transport one.  Move them.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-mac80211.c b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
index 17358cfb68a9..ca0c46506674 100644
--- a/drivers/net/wireless/iwlwifi/iwl-mac80211.c
+++ b/drivers/net/wireless/iwlwifi/iwl-mac80211.c
@@ -195,7 +195,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
                             WIPHY_FLAG_DISABLE_BEACON_HINTS |
                             WIPHY_FLAG_IBSS_RSN;
 
-        if (trans(priv)->ucode_wowlan.code.len &&
+        if (nic(priv)->fw.ucode_wowlan.code.len &&
             device_can_wakeup(trans(priv)->dev)) {
                 hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT |
                                           WIPHY_WOWLAN_DISCONNECT |
@@ -453,17 +453,17 @@ static int iwlagn_mac_resume(struct ieee80211_hw *hw)
 
 #ifdef CONFIG_IWLWIFI_DEBUGFS
                 if (ret == 0) {
-                        struct iwl_trans *trans = trans(priv);
+                        struct iwl_nic *nic = nic(priv);
                         if (!priv->wowlan_sram)
                                 priv->wowlan_sram =
-                                        kzalloc(trans->ucode_wowlan.data.len,
+                                        kzalloc(nic->fw.ucode_wowlan.data.len,
                                                 GFP_KERNEL);
 
                         if (priv->wowlan_sram)
                                 _iwl_read_targ_mem_words(
                                         trans(priv), 0x800000,
                                         priv->wowlan_sram,
-                                        trans->ucode_wowlan.data.len / 4);
+                                        nic->fw.ucode_wowlan.data.len / 4);
                 }
 #endif
         }