1 files changed, 15 insertions, 61 deletions

diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 4773da6dc6f2..5da0826bf1be 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -177,74 +177,30 @@ static u32 ath9k_hw_4k_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
 }
 #endif
 
-
-#undef SIZE_EEPROM_4K
-
 static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
 {
-#define EEPROM_4K_SIZE (sizeof(struct ar5416_eeprom_4k) / sizeof(u16))
-        struct ath_common *common = ath9k_hw_common(ah);
         struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k;
-        u16 *eepdata, temp, magic, magic2;
-        u32 sum = 0, el;
-        bool need_swap = false;
-        int i, addr;
+        u32 el;
+        bool need_swap;
+        int i, err;
 
-
-        if (!ath9k_hw_use_flash(ah)) {
-                if (!ath9k_hw_nvram_read(ah, AR5416_EEPROM_MAGIC_OFFSET,
-                                         &magic)) {
-                        ath_err(common, "Reading Magic # failed\n");
-                        return false;
-                }
-
-                ath_dbg(common, EEPROM, "Read Magic = 0x%04X\n", magic);
-
-                if (magic != AR5416_EEPROM_MAGIC) {
-                        magic2 = swab16(magic);
-
-                        if (magic2 == AR5416_EEPROM_MAGIC) {
-                                need_swap = true;
-                                eepdata = (u16 *) (&ah->eeprom);
-
-                                for (addr = 0; addr < EEPROM_4K_SIZE; addr++) {
-                                        temp = swab16(*eepdata);
-                                        *eepdata = temp;
-                                        eepdata++;
-                                }
-                        } else {
-                                ath_err(common,
-                                        "Invalid EEPROM Magic. Endianness mismatch.\n");
-                                return -EINVAL;
-                        }
-                }
-        }
-
-        ath_dbg(common, EEPROM, "need_swap = %s\n",
-                need_swap ? "True" : "False");
+        err = ath9k_hw_nvram_swap_data(ah, &need_swap, SIZE_EEPROM_4K);
+        if (err)
+                return err;
 
         if (need_swap)
-                el = swab16(ah->eeprom.map4k.baseEepHeader.length);
-        else
-                el = ah->eeprom.map4k.baseEepHeader.length;
-
-        if (el > sizeof(struct ar5416_eeprom_4k))
-                el = sizeof(struct ar5416_eeprom_4k) / sizeof(u16);
+                el = swab16(eep->baseEepHeader.length);
         else
-                el = el / sizeof(u16);
+                el = eep->baseEepHeader.length;
 
-        eepdata = (u16 *)(&ah->eeprom);
-
-        for (i = 0; i < el; i++)
-                sum ^= *eepdata++;
+        el = min(el / sizeof(u16), SIZE_EEPROM_4K);
+        if (!ath9k_hw_nvram_validate_checksum(ah, el))
+                return -EINVAL;
 
         if (need_swap) {
                 u32 integer;
                 u16 word;
 
-                ath_dbg(common, EEPROM,
-                        "EEPROM Endianness is not native.. Changing\n");
-
                 word = swab16(eep->baseEepHeader.length);
                 eep->baseEepHeader.length = word;
 
@@ -283,17 +239,15 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
                 }
         }
 
-        if (sum != 0xffff || ah->eep_ops->get_eeprom_ver(ah) != AR5416_EEP_VER ||
-            ah->eep_ops->get_eeprom_rev(ah) < AR5416_EEP_NO_BACK_VER) {
-                ath_err(common, "Bad EEPROM checksum 0x%x or revision 0x%04x\n",
-                        sum, ah->eep_ops->get_eeprom_ver(ah));
+        if (!ath9k_hw_nvram_check_version(ah, AR5416_EEP_VER,
+            AR5416_EEP_NO_BACK_VER))
                 return -EINVAL;
-        }
 
         return 0;
-#undef EEPROM_4K_SIZE
 }
 
+#undef SIZE_EEPROM_4K
+
 static u32 ath9k_hw_4k_get_eeprom(struct ath_hw *ah,
                                   enum eeprom_param param)
 {