rt2800usb: add rt2800_rfcsr_[read,write]() wrappers

Part of preparations for later code unification.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index d26e1ea..8cfb557 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -189,6 +189,18 @@ static void rt2800usb_rfcsr_read(struct rt2x00_dev *rt2x00dev,
        mutex_unlock(&rt2x00dev->csr_mutex);
 }
 
+static inline void rt2800_rfcsr_write(struct rt2x00_dev *rt2x00dev,
+                                     const unsigned int word, const u8 value)
+{
+       rt2800usb_rfcsr_write(rt2x00dev, word, value);
+}
+
+static inline void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,
+                                    const unsigned int word, u8 *value)
+{
+       rt2800usb_rfcsr_read(rt2x00dev, word, value);
+}
+
 static void rt2800usb_rf_write(struct rt2x00_dev *rt2x00dev,
                               const unsigned int word, const u32 value)
 {
@@ -762,28 +774,28 @@ static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev,
 {
        u8 rfcsr;
 
-       rt2800usb_rfcsr_write(rt2x00dev, 2, rf->rf1);
-       rt2800usb_rfcsr_write(rt2x00dev, 2, rf->rf3);
+       rt2800_rfcsr_write(rt2x00dev, 2, rf->rf1);
+       rt2800_rfcsr_write(rt2x00dev, 2, rf->rf3);
 
-       rt2800usb_rfcsr_read(rt2x00dev, 6, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR6_R, rf->rf2);
-       rt2800usb_rfcsr_write(rt2x00dev, 6, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
 
-       rt2800usb_rfcsr_read(rt2x00dev, 12, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 12, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR12_TX_POWER,
                          TXPOWER_G_TO_DEV(info->tx_power1));
-       rt2800usb_rfcsr_write(rt2x00dev, 12, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 12, rfcsr);
 
-       rt2800usb_rfcsr_read(rt2x00dev, 23, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset);
-       rt2800usb_rfcsr_write(rt2x00dev, 23, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);
 
-       rt2800usb_rfcsr_write(rt2x00dev, 24,
+       rt2800_rfcsr_write(rt2x00dev, 24,
                              rt2x00dev->calibration[conf_is_ht40(conf)]);
 
-       rt2800usb_rfcsr_read(rt2x00dev, 23, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 23, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1);
-       rt2800usb_rfcsr_write(rt2x00dev, 23, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 23, rfcsr);
 }
 
 static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev,
@@ -1656,15 +1668,15 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev,
        u8 stopband;
        u8 overtuned = 0;
 
-       rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);
+       rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);
 
        rt2800_bbp_read(rt2x00dev, 4, &bbp);
        rt2x00_set_field8(&bbp, BBP4_BANDWIDTH, 2 * bw40);
        rt2800_bbp_write(rt2x00dev, 4, bbp);
 
-       rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 1);
-       rt2800usb_rfcsr_write(rt2x00dev, 22, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
 
        /*
         * Set power & frequency of passband test tone
@@ -1697,12 +1709,12 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev,
                } else
                        break;
 
-               rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);
+               rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);
        }
 
        rfcsr24 -= !!overtuned;
 
-       rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24);
+       rt2800_rfcsr_write(rt2x00dev, 24, rfcsr24);
        return rfcsr24;
 }
 
@@ -1717,33 +1729,33 @@ static int rt2800usb_init_rfcsr(struct rt2x00_dev *rt2x00dev)
        /*
         * Init RF calibration.
         */
-       rt2800usb_rfcsr_read(rt2x00dev, 30, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 1);
-       rt2800usb_rfcsr_write(rt2x00dev, 30, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
        msleep(1);
        rt2x00_set_field8(&rfcsr, RFCSR30_RF_CALIBRATION, 0);
-       rt2800usb_rfcsr_write(rt2x00dev, 30, rfcsr);
-
-       rt2800usb_rfcsr_write(rt2x00dev, 4, 0x40);
-       rt2800usb_rfcsr_write(rt2x00dev, 5, 0x03);
-       rt2800usb_rfcsr_write(rt2x00dev, 6, 0x02);
-       rt2800usb_rfcsr_write(rt2x00dev, 7, 0x70);
-       rt2800usb_rfcsr_write(rt2x00dev, 9, 0x0f);
-       rt2800usb_rfcsr_write(rt2x00dev, 10, 0x71);
-       rt2800usb_rfcsr_write(rt2x00dev, 11, 0x21);
-       rt2800usb_rfcsr_write(rt2x00dev, 12, 0x7b);
-       rt2800usb_rfcsr_write(rt2x00dev, 14, 0x90);
-       rt2800usb_rfcsr_write(rt2x00dev, 15, 0x58);
-       rt2800usb_rfcsr_write(rt2x00dev, 16, 0xb3);
-       rt2800usb_rfcsr_write(rt2x00dev, 17, 0x92);
-       rt2800usb_rfcsr_write(rt2x00dev, 18, 0x2c);
-       rt2800usb_rfcsr_write(rt2x00dev, 19, 0x02);
-       rt2800usb_rfcsr_write(rt2x00dev, 20, 0xba);
-       rt2800usb_rfcsr_write(rt2x00dev, 21, 0xdb);
-       rt2800usb_rfcsr_write(rt2x00dev, 24, 0x16);
-       rt2800usb_rfcsr_write(rt2x00dev, 25, 0x01);
-       rt2800usb_rfcsr_write(rt2x00dev, 27, 0x03);
-       rt2800usb_rfcsr_write(rt2x00dev, 29, 0x1f);
+       rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
+
+       rt2800_rfcsr_write(rt2x00dev, 4, 0x40);
+       rt2800_rfcsr_write(rt2x00dev, 5, 0x03);
+       rt2800_rfcsr_write(rt2x00dev, 6, 0x02);
+       rt2800_rfcsr_write(rt2x00dev, 7, 0x70);
+       rt2800_rfcsr_write(rt2x00dev, 9, 0x0f);
+       rt2800_rfcsr_write(rt2x00dev, 10, 0x71);
+       rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
+       rt2800_rfcsr_write(rt2x00dev, 12, 0x7b);
+       rt2800_rfcsr_write(rt2x00dev, 14, 0x90);
+       rt2800_rfcsr_write(rt2x00dev, 15, 0x58);
+       rt2800_rfcsr_write(rt2x00dev, 16, 0xb3);
+       rt2800_rfcsr_write(rt2x00dev, 17, 0x92);
+       rt2800_rfcsr_write(rt2x00dev, 18, 0x2c);
+       rt2800_rfcsr_write(rt2x00dev, 19, 0x02);
+       rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
+       rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
+       rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
+       rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
+       rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
+       rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
 
        /*
         * Set RX Filter calibration for 20MHz and 40MHz
@@ -1758,9 +1770,9 @@ static int rt2800usb_init_rfcsr(struct rt2x00_dev *rt2x00dev)
         */
        rt2800_bbp_write(rt2x00dev, 24, 0);
 
-       rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr);
+       rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
        rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 0);
-       rt2800usb_rfcsr_write(rt2x00dev, 22, rfcsr);
+       rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
 
        /*
         * set BBP back to BW20