rt2800usb: add rt2800_mcu_request() wrapper

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 15aed2916e0c9d7732ec2e4ada9c283b8622aae0..3783fdc4251f7ae1bb89cf271d916ad8fd79a190 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -259,6 +259,13 @@ static void rt2800usb_mcu_request(struct rt2x00_dev *rt2x00dev,
        mutex_unlock(&rt2x00dev->csr_mutex);
 }
 
+static inline void rt2800_mcu_request(struct rt2x00_dev *rt2x00dev,
+                                     const u8 command, const u8 token,
+                                     const u8 arg0, const u8 arg1)
+{
+       rt2800usb_mcu_request(rt2x00dev, command, token, arg0, arg1);
+}
+
 #ifdef CONFIG_RT2X00_LIB_DEBUGFS
 static const struct rt2x00debug rt2800usb_rt2x00debug = {
        .owner  = THIS_MODULE,
@@ -319,10 +326,10 @@ static void rt2800usb_brightness_set(struct led_classdev *led_cdev,
                                   EEPROM_FREQ_LED_MODE);
 
        if (led->type == LED_TYPE_RADIO) {
-               rt2800usb_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
+               rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
                                      enabled ? 0x20 : 0);
        } else if (led->type == LED_TYPE_ASSOC) {
-               rt2800usb_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
+               rt2800_mcu_request(led->rt2x00dev, MCU_LED, 0xff, ledmode,
                                      enabled ? (bg_mode ? 0x60 : 0xa0) : 0x20);
        } else if (led->type == LED_TYPE_QUALITY) {
                /*
@@ -333,7 +340,7 @@ static void rt2800usb_brightness_set(struct led_classdev *led_cdev,
                 * work with bitshifting:
                 *      (1 << level) - 1
                 */
-               rt2800usb_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
+               rt2800_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
                                      (1 << brightness / (LED_FULL / 6)) - 1,
                                      polarity);
        }
@@ -1233,13 +1240,13 @@ static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
        /*
         * Send signal to firmware during boot time.
         */
-       rt2800usb_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0xff, 0, 0);
+       rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0xff, 0, 0);
 
        if ((chipset == 0x3070) ||
            (chipset == 0x3071) ||
            (chipset == 0x3572)) {
                udelay(200);
-               rt2800usb_mcu_request(rt2x00dev, MCU_CURRENT, 0, 0, 0);
+               rt2800_mcu_request(rt2x00dev, MCU_CURRENT, 0, 0, 0);
                udelay(10);
        }
 
@@ -1875,15 +1882,15 @@ static int rt2800usb_enable_radio(struct rt2x00_dev *rt2x00dev)
         * Initialize LED control
         */
        rt2x00_eeprom_read(rt2x00dev, EEPROM_LED1, &word);
-       rt2800usb_mcu_request(rt2x00dev, MCU_LED_1, 0xff,
+       rt2800_mcu_request(rt2x00dev, MCU_LED_1, 0xff,
                              word & 0xff, (word >> 8) & 0xff);
 
        rt2x00_eeprom_read(rt2x00dev, EEPROM_LED2, &word);
-       rt2800usb_mcu_request(rt2x00dev, MCU_LED_2, 0xff,
+       rt2800_mcu_request(rt2x00dev, MCU_LED_2, 0xff,
                              word & 0xff, (word >> 8) & 0xff);
 
        rt2x00_eeprom_read(rt2x00dev, EEPROM_LED3, &word);
-       rt2800usb_mcu_request(rt2x00dev, MCU_LED_3, 0xff,
+       rt2800_mcu_request(rt2x00dev, MCU_LED_3, 0xff,
                              word & 0xff, (word >> 8) & 0xff);
 
        return 0;
@@ -1912,9 +1919,9 @@ static int rt2800usb_set_state(struct rt2x00_dev *rt2x00dev,
                               enum dev_state state)
 {
        if (state == STATE_AWAKE)
-               rt2800usb_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 0);
+               rt2800_mcu_request(rt2x00dev, MCU_WAKEUP, 0xff, 0, 0);
        else
-               rt2800usb_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 2);
+               rt2800_mcu_request(rt2x00dev, MCU_SLEEP, 0xff, 0, 2);
 
        return 0;
 }