1 files changed, 67 insertions, 68 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index d19bee43861d..639d5a2f84e2 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -245,43 +245,48 @@ rf_write:
 }
 
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
-#define CSR_OFFSET(__word)      ( CSR_REG_BASE + ((__word) * sizeof(u16)) )
-
-static void rt2500usb_read_csr(struct rt2x00_dev *rt2x00dev,
-                               const unsigned int word, u32 *data)
+static void _rt2500usb_register_read(struct rt2x00_dev *rt2x00dev,
+                                     const unsigned int offset,
+                                     u32 *value)
 {
-        rt2500usb_register_read(rt2x00dev, CSR_OFFSET(word), (u16 *) data);
+        rt2500usb_register_read(rt2x00dev, offset, (u16 *)value);
 }
 
-static void rt2500usb_write_csr(struct rt2x00_dev *rt2x00dev,
-                                const unsigned int word, u32 data)
+static void _rt2500usb_register_write(struct rt2x00_dev *rt2x00dev,
+                                      const unsigned int offset,
+                                      u32 value)
 {
-        rt2500usb_register_write(rt2x00dev, CSR_OFFSET(word), data);
+        rt2500usb_register_write(rt2x00dev, offset, value);
 }
 
 static const struct rt2x00debug rt2500usb_rt2x00debug = {
         .owner  = THIS_MODULE,
         .csr    = {
-                .read           = rt2500usb_read_csr,
-                .write          = rt2500usb_write_csr,
+                .read           = _rt2500usb_register_read,
+                .write          = _rt2500usb_register_write,
+                .flags          = RT2X00DEBUGFS_OFFSET,
+                .word_base      = CSR_REG_BASE,
                 .word_size      = sizeof(u16),
                 .word_count     = CSR_REG_SIZE / sizeof(u16),
         },
         .eeprom = {
                 .read           = rt2x00_eeprom_read,
                 .write          = rt2x00_eeprom_write,
+                .word_base      = EEPROM_BASE,
                 .word_size      = sizeof(u16),
                 .word_count     = EEPROM_SIZE / sizeof(u16),
         },
         .bbp    = {
                 .read           = rt2500usb_bbp_read,
                 .write          = rt2500usb_bbp_write,
+                .word_base      = BBP_BASE,
                 .word_size      = sizeof(u8),
                 .word_count     = BBP_SIZE / sizeof(u8),
         },
         .rf     = {
                 .read           = rt2x00_rf_read,
                 .write          = rt2500usb_rf_write,
+                .word_base      = RF_BASE,
                 .word_size      = sizeof(u32),
                 .word_count     = RF_SIZE / sizeof(u32),
         },
@@ -423,57 +428,16 @@ static void rt2500usb_config_erp(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field16(&reg, TXRX_CSR10_AUTORESPOND_PREAMBLE,
                            !!erp->short_preamble);
         rt2500usb_register_write(rt2x00dev, TXRX_CSR10, reg);
-}
-
-static void rt2500usb_config_phymode(struct rt2x00_dev *rt2x00dev,
-                                     const int basic_rate_mask)
-{
-        rt2500usb_register_write(rt2x00dev, TXRX_CSR11, basic_rate_mask);
-}
 
-static void rt2500usb_config_channel(struct rt2x00_dev *rt2x00dev,
-                                     struct rf_channel *rf, const int txpower)
-{
-        /*
-         * Set TXpower.
-         */
-        rt2x00_set_field32(&rf->rf3, RF3_TXPOWER, TXPOWER_TO_DEV(txpower));
+        rt2500usb_register_write(rt2x00dev, TXRX_CSR11, erp->basic_rates);
 
-        /*
-         * For RT2525E we should first set the channel to half band higher.
-         */
-        if (rt2x00_rf(&rt2x00dev->chip, RF2525E)) {
-                static const u32 vals[] = {
-                        0x000008aa, 0x000008ae, 0x000008ae, 0x000008b2,
-                        0x000008b2, 0x000008b6, 0x000008b6, 0x000008ba,
-                        0x000008ba, 0x000008be, 0x000008b7, 0x00000902,
-                        0x00000902, 0x00000906
-                };
-
-                rt2500usb_rf_write(rt2x00dev, 2, vals[rf->channel - 1]);
-                if (rf->rf4)
-                        rt2500usb_rf_write(rt2x00dev, 4, rf->rf4);
-        }
-
-        rt2500usb_rf_write(rt2x00dev, 1, rf->rf1);
-        rt2500usb_rf_write(rt2x00dev, 2, rf->rf2);
-        rt2500usb_rf_write(rt2x00dev, 3, rf->rf3);
-        if (rf->rf4)
-                rt2500usb_rf_write(rt2x00dev, 4, rf->rf4);
-}
-
-static void rt2500usb_config_txpower(struct rt2x00_dev *rt2x00dev,
-                                     const int txpower)
-{
-        u32 rf3;
-
-        rt2x00_rf_read(rt2x00dev, 3, &rf3);
-        rt2x00_set_field32(&rf3, RF3_TXPOWER, TXPOWER_TO_DEV(txpower));
-        rt2500usb_rf_write(rt2x00dev, 3, rf3);
+        rt2500usb_register_write(rt2x00dev, MAC_CSR10, erp->slot_time);
+        rt2500usb_register_write(rt2x00dev, MAC_CSR11, erp->sifs);
+        rt2500usb_register_write(rt2x00dev, MAC_CSR12, erp->eifs);
 }
 
-static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
-                                     struct antenna_setup *ant)
+static void rt2500usb_config_ant(struct rt2x00_dev *rt2x00dev,
+                                 struct antenna_setup *ant)
 {
         u8 r2;
         u8 r14;
@@ -555,15 +519,52 @@ static void rt2500usb_config_antenna(struct rt2x00_dev *rt2x00dev,
         rt2500usb_register_write(rt2x00dev, PHY_CSR6, csr6);
 }
 
+static void rt2500usb_config_channel(struct rt2x00_dev *rt2x00dev,
+                                     struct rf_channel *rf, const int txpower)
+{
+        /*
+         * Set TXpower.
+         */
+        rt2x00_set_field32(&rf->rf3, RF3_TXPOWER, TXPOWER_TO_DEV(txpower));
+
+        /*
+         * For RT2525E we should first set the channel to half band higher.
+         */
+        if (rt2x00_rf(&rt2x00dev->chip, RF2525E)) {
+                static const u32 vals[] = {
+                        0x000008aa, 0x000008ae, 0x000008ae, 0x000008b2,
+                        0x000008b2, 0x000008b6, 0x000008b6, 0x000008ba,
+                        0x000008ba, 0x000008be, 0x000008b7, 0x00000902,
+                        0x00000902, 0x00000906
+                };
+
+                rt2500usb_rf_write(rt2x00dev, 2, vals[rf->channel - 1]);
+                if (rf->rf4)
+                        rt2500usb_rf_write(rt2x00dev, 4, rf->rf4);
+        }
+
+        rt2500usb_rf_write(rt2x00dev, 1, rf->rf1);
+        rt2500usb_rf_write(rt2x00dev, 2, rf->rf2);
+        rt2500usb_rf_write(rt2x00dev, 3, rf->rf3);
+        if (rf->rf4)
+                rt2500usb_rf_write(rt2x00dev, 4, rf->rf4);
+}
+
+static void rt2500usb_config_txpower(struct rt2x00_dev *rt2x00dev,
+                                     const int txpower)
+{
+        u32 rf3;
+
+        rt2x00_rf_read(rt2x00dev, 3, &rf3);
+        rt2x00_set_field32(&rf3, RF3_TXPOWER, TXPOWER_TO_DEV(txpower));
+        rt2500usb_rf_write(rt2x00dev, 3, rf3);
+}
+
 static void rt2500usb_config_duration(struct rt2x00_dev *rt2x00dev,
                                       struct rt2x00lib_conf *libconf)
 {
         u16 reg;
 
-        rt2500usb_register_write(rt2x00dev, MAC_CSR10, libconf->slot_time);
-        rt2500usb_register_write(rt2x00dev, MAC_CSR11, libconf->sifs);
-        rt2500usb_register_write(rt2x00dev, MAC_CSR12, libconf->eifs);
-
         rt2500usb_register_read(rt2x00dev, TXRX_CSR18, &reg);
         rt2x00_set_field16(&reg, TXRX_CSR18_INTERVAL,
                            libconf->conf->beacon_int * 4);
@@ -574,17 +575,14 @@ static void rt2500usb_config(struct rt2x00_dev *rt2x00dev,
                              struct rt2x00lib_conf *libconf,
                              const unsigned int flags)
 {
-        if (flags & CONFIG_UPDATE_PHYMODE)
-                rt2500usb_config_phymode(rt2x00dev, libconf->basic_rates);
-        if (flags & CONFIG_UPDATE_CHANNEL)
+        if (flags & IEEE80211_CONF_CHANGE_CHANNEL)
                 rt2500usb_config_channel(rt2x00dev, &libconf->rf,
                                          libconf->conf->power_level);
-        if ((flags & CONFIG_UPDATE_TXPOWER) && !(flags & CONFIG_UPDATE_CHANNEL))
+        if ((flags & IEEE80211_CONF_CHANGE_POWER) &&
+            !(flags & IEEE80211_CONF_CHANGE_CHANNEL))
                 rt2500usb_config_txpower(rt2x00dev,
                                          libconf->conf->power_level);
-        if (flags & CONFIG_UPDATE_ANTENNA)
-                rt2500usb_config_antenna(rt2x00dev, &libconf->ant);
-        if (flags & (CONFIG_UPDATE_SLOT_TIME | CONFIG_UPDATE_BEACON_INT))
+        if (flags & IEEE80211_CONF_CHANGE_BEACON_INTERVAL)
                 rt2500usb_config_duration(rt2x00dev, libconf);
 }
 
@@ -1794,6 +1792,7 @@ static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {
         .config_filter          = rt2500usb_config_filter,
         .config_intf            = rt2500usb_config_intf,
         .config_erp             = rt2500usb_config_erp,
+        .config_ant             = rt2500usb_config_ant,
         .config                 = rt2500usb_config,
 };