ath5k: Reset cleanup and generic cleanup

* No functional changes * Clean up reset: Introduce init functions for each unit and call them instead of having everything inside ath5k_hw_reset (it's just c/p for now so nothing changes except calling order -I tested it with various cards and it's ok-) * Further cleanups: ofdm_timings belongs to phy.c rate_duration belongs to pcu.c clock functions are general and belong to reset.c (more to follow) * Reorder functions for better organization: We start with helpers and other functions follow in categories, init functions are last Signed-off-by: Nick Kossifidis <mickflemm@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
author: Nick Kossifidis <mickflemm@gmail.com> 2010-11-23 13:36:45 -0500
committer: John W. Linville <linville@tuxdriver.com> 2010-11-30 13:52:29 -0500
commit: 9320b5c4a7260d9593102f378201d17e3f030739 (patch)
tree: d4a85a6286b47f86a66a82ad3e756f5117af2b39 /drivers/net/wireless/ath/ath5k/eeprom.c
parent: ea066d5a91f2610116dcd27054f749e4f07799d8 (diff)
1 files changed, 82 insertions, 65 deletions
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 39722dd73e43..033eab9ad4e7 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -28,6 +28,43 @@
 #include "debug.h"
 #include "base.h"
+/******************\
+* Helper functions *
+\******************/
+/*
+ * Translate binary channel representation in EEPROM to frequency
+ */
+static u16 ath5k_eeprom_bin2freq(struct ath5k_eeprom_info *ee, u16 bin,
+                                                        unsigned int mode)
+{
+        u16 val;
+        if (bin == AR5K_EEPROM_CHANNEL_DIS)
+                return bin;
+        if (mode == AR5K_EEPROM_MODE_11A) {
+                if (ee->ee_version > AR5K_EEPROM_VERSION_3_2)
+                        val = (5 * bin) + 4800;
+                else
+                        val = bin > 62 ? (10 * 62) + (5 * (bin - 62)) + 5100 :
+                                (bin * 10) + 5100;
+        } else {
+                if (ee->ee_version > AR5K_EEPROM_VERSION_3_2)
+                        val = bin + 2300;
+                else
+                        val = bin + 2400;
+        }
+        return val;
+}
+/*********\
+* Parsers *
+\*********/
 /*
 * Read from eeprom
 */
@@ -63,33 +100,6 @@ static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data)
 }
 /*
- * Translate binary channel representation in EEPROM to frequency
- */
-static u16 ath5k_eeprom_bin2freq(struct ath5k_eeprom_info *ee, u16 bin,
-                                 unsigned int mode)
-{
-        u16 val;
-        if (bin == AR5K_EEPROM_CHANNEL_DIS)
-                return bin;
-        if (mode == AR5K_EEPROM_MODE_11A) {
-                if (ee->ee_version > AR5K_EEPROM_VERSION_3_2)
-                        val = (5 * bin) + 4800;
-                else
-                        val = bin > 62 ? (10 * 62) + (5 * (bin - 62)) + 5100 :
-                                (bin * 10) + 5100;
-        } else {
-                if (ee->ee_version > AR5K_EEPROM_VERSION_3_2)
-                        val = bin + 2300;
-                else
-                        val = bin + 2400;
-        }
-        return val;
-}
-/*
 * Initialize eeprom & capabilities structs
 */
 static int
@@ -647,6 +657,7 @@ ath5k_eeprom_init_11bg_2413(struct ath5k_hw *ah, unsigned int mode, int offset)
        return 0;
 }
 /*
 * Read power calibration for RF5111 chips
 *
@@ -1514,6 +1525,7 @@ ath5k_eeprom_read_target_rate_pwr_info(struct ath5k_hw *ah, unsigned int mode)
        return 0;
 }
 /*
 * Read per channel calibration info from EEPROM
 *
@@ -1607,15 +1619,6 @@ ath5k_eeprom_free_pcal_info(struct ath5k_hw *ah, int mode)
        return 0;
 }
-void
-ath5k_eeprom_detach(struct ath5k_hw *ah)
-{
-        u8 mode;
-        for (mode = AR5K_EEPROM_MODE_11A; mode <= AR5K_EEPROM_MODE_11G; mode++)
-                ath5k_eeprom_free_pcal_info(ah, mode);
-}
 /* Read conformance test limits used for regulatory control */
 static int
 ath5k_eeprom_read_ctl_info(struct ath5k_hw *ah)
@@ -1757,6 +1760,44 @@ ath5k_eeprom_read_spur_chans(struct ath5k_hw *ah)
 }
 /*
+ * Read the MAC address from eeprom
+ */
+int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
+{
+        u8 mac_d[ETH_ALEN] = {};
+        u32 total, offset;
+        u16 data;
+        int octet, ret;
+        ret = ath5k_hw_eeprom_read(ah, 0x20, &data);
+        if (ret)
+                return ret;
+        for (offset = 0x1f, octet = 0, total = 0; offset >= 0x1d; offset--) {
+                ret = ath5k_hw_eeprom_read(ah, offset, &data);
+                if (ret)
+                        return ret;
+                total += data;
+                mac_d[octet + 1] = data & 0xff;
+                mac_d[octet] = data >> 8;
+                octet += 2;
+        }
+        if (!total || total == 3 * 0xffff)
+                return -EINVAL;
+        memcpy(mac, mac_d, ETH_ALEN);
+        return 0;
+}
+/***********************\
+* Init/Detach functions *
+\***********************/
+/*
 * Initialize eeprom data structure
 */
 int
@@ -1787,35 +1828,11 @@ ath5k_eeprom_init(struct ath5k_hw *ah)
        return 0;
 }
-/*
+void
- * Read the MAC address from eeprom
+ath5k_eeprom_detach(struct ath5k_hw *ah)
- */
-int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
 {
-        u8 mac_d[ETH_ALEN] = {};
+        u8 mode;
-        u32 total, offset;
-        u16 data;
-        int octet, ret;
-        ret = ath5k_hw_eeprom_read(ah, 0x20, &data);
-        if (ret)
-                return ret;
-        for (offset = 0x1f, octet = 0, total = 0; offset >= 0x1d; offset--) {
-                ret = ath5k_hw_eeprom_read(ah, offset, &data);
-                if (ret)
-                        return ret;
-                total += data;
-                mac_d[octet + 1] = data & 0xff;
-                mac_d[octet] = data >> 8;
-                octet += 2;
-        }
-        if (!total || total == 3 * 0xffff)
-                return -EINVAL;
-        memcpy(mac, mac_d, ETH_ALEN);
-        return 0;
+        for (mode = AR5K_EEPROM_MODE_11A; mode <= AR5K_EEPROM_MODE_11G; mode++)
+                ath5k_eeprom_free_pcal_info(ah, mode);
 }
author	Nick Kossifidis <mickflemm@gmail.com>	2010-11-23 13:36:45 -0500
committer	John W. Linville <linville@tuxdriver.com>	2010-11-30 13:52:29 -0500
commit	9320b5c4a7260d9593102f378201d17e3f030739 (patch)
tree	d4a85a6286b47f86a66a82ad3e756f5117af2b39 /drivers/net/wireless/ath/ath5k/eeprom.c
parent	ea066d5a91f2610116dcd27054f749e4f07799d8 (diff)