iwlagn: combine firmware code/data

On new hardware, ucode images always come in
pairs: code and data. Therefore, combine the
variables into an appropriate struct and use
that when both code and data are needed.

Also, combine allocation and copying so that
we have less code in total.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 414968c6b7cf..857eb0e9e397 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -479,6 +479,10 @@ struct fw_desc {
         u32 len;                /* bytes */
 };
 
+struct fw_img {
+        struct fw_desc code, data;
+};
+
 /* v1/v2 uCode file layout */
 struct iwl_ucode_header {
         __le32 ver;     /* major/minor/API/serial */
@@ -1266,10 +1270,9 @@ struct iwl_priv {
         int fw_index;                   /* firmware we're trying to load */
         u32 ucode_ver;                  /* version of ucode, copy of
                                            iwl_ucode.ver */
-        struct fw_desc ucode_code;      /* runtime inst */
-        struct fw_desc ucode_data;      /* runtime data original */
-        struct fw_desc ucode_init;      /* initialization inst */
-        struct fw_desc ucode_init_data; /* initialization data */
+        struct fw_img ucode_rt;
+        struct fw_img ucode_init;
+
         enum iwlagn_ucode_subtype ucode_type;
         u8 ucode_write_complete;        /* the image write is complete */
         char firmware_name[25];