1 files changed, 5 insertions, 24 deletions

diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 8af477dd6fc7..644962adda97 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -414,27 +414,11 @@ static int ath5k_eeprom_read_modes(struct ath5k_hw *ah, u32 *offset,
                 break;
         }
 
-done:
-        /* return new offset */
-        *offset = o;
-
-        return 0;
-}
-
-/*
- * Read turbo mode information on newer EEPROM versions
- */
-static int
-ath5k_eeprom_read_turbo_modes(struct ath5k_hw *ah,
-                              u32 *offset, unsigned int mode)
-{
-        struct ath5k_eeprom_info *ee = &ah->ah_capabilities.cap_eeprom;
-        u32 o = *offset;
-        u16 val;
-        int ret;
-
+        /*
+         * Read turbo mode information on newer EEPROM versions
+         */
         if (ee->ee_version < AR5K_EEPROM_VERSION_5_0)
-                return 0;
+                goto done;
 
         switch (mode){
         case AR5K_EEPROM_MODE_11A:
@@ -468,6 +452,7 @@ ath5k_eeprom_read_turbo_modes(struct ath5k_hw *ah,
                 break;
         }
 
+done:
         /* return new offset */
         *offset = o;
 
@@ -504,10 +489,6 @@ ath5k_eeprom_init_modes(struct ath5k_hw *ah)
                 ret = ath5k_eeprom_read_modes(ah, &offset, mode);
                 if (ret)
                         return ret;
-
-                ret = ath5k_eeprom_read_turbo_modes(ah, &offset, mode);
-                if (ret)
-                        return ret;
         }
 
         /* override for older eeprom versions for better performance */