1 files changed, 36 insertions, 27 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 54c9a75b549b..5ade097ed45e 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -244,27 +244,39 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 #endif /* CONFIG_RT2500PCI_RFKILL */
 
 #ifdef CONFIG_RT2500PCI_LEDS
-static void rt2500pci_led_brightness(struct led_classdev *led_cdev,
+static void rt2500pci_brightness_set(struct led_classdev *led_cdev,
                                      enum led_brightness brightness)
 {
         struct rt2x00_led *led =
             container_of(led_cdev, struct rt2x00_led, led_dev);
         unsigned int enabled = brightness != LED_OFF;
-        unsigned int activity =
-            led->rt2x00dev->led_flags & LED_SUPPORT_ACTIVITY;
         u32 reg;
 
         rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
 
-        if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC) {
+        if (led->type == LED_TYPE_RADIO || led->type == LED_TYPE_ASSOC)
                 rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
-                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled && activity);
-        }
+        else if (led->type == LED_TYPE_ACTIVITY)
+                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled);
 
         rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
 }
-#else
-#define rt2500pci_led_brightness        NULL
+
+static int rt2500pci_blink_set(struct led_classdev *led_cdev,
+                               unsigned long *delay_on,
+                               unsigned long *delay_off)
+{
+        struct rt2x00_led *led =
+            container_of(led_cdev, struct rt2x00_led, led_dev);
+        u32 reg;
+
+        rt2x00pci_register_read(led->rt2x00dev, LEDCSR, &reg);
+        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, *delay_on);
+        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, *delay_off);
+        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+
+        return 0;
+}
 #endif /* CONFIG_RT2500PCI_LEDS */
 
 /*
@@ -812,11 +824,6 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev)
         rt2x00_set_field32(&reg, CSR11_CW_SELECT, 0);
         rt2x00pci_register_write(rt2x00dev, CSR11, reg);
 
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);
-        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-
         rt2x00pci_register_write(rt2x00dev, CNT3, 0);
 
         rt2x00pci_register_read(rt2x00dev, TXCSR8, &reg);
@@ -1468,19 +1475,22 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
 #ifdef CONFIG_RT2500PCI_LEDS
         value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
 
-        switch (value) {
-        case LED_MODE_ASUS:
-        case LED_MODE_ALPHA:
-        case LED_MODE_DEFAULT:
-                rt2x00dev->led_flags = LED_SUPPORT_RADIO;
-                break;
-        case LED_MODE_TXRX_ACTIVITY:
-                rt2x00dev->led_flags =
-                    LED_SUPPORT_RADIO | LED_SUPPORT_ACTIVITY;
-                break;
-        case LED_MODE_SIGNAL_STRENGTH:
-                rt2x00dev->led_flags = LED_SUPPORT_RADIO;
-                break;
+        rt2x00dev->led_radio.rt2x00dev = rt2x00dev;
+        rt2x00dev->led_radio.type = LED_TYPE_RADIO;
+        rt2x00dev->led_radio.led_dev.brightness_set =
+            rt2500pci_brightness_set;
+        rt2x00dev->led_radio.led_dev.blink_set =
+            rt2500pci_blink_set;
+        rt2x00dev->led_radio.flags = LED_INITIALIZED;
+
+        if (value == LED_MODE_TXRX_ACTIVITY) {
+                rt2x00dev->led_qual.rt2x00dev = rt2x00dev;
+                rt2x00dev->led_radio.type = LED_TYPE_ACTIVITY;
+                rt2x00dev->led_qual.led_dev.brightness_set =
+                    rt2500pci_brightness_set;
+                rt2x00dev->led_qual.led_dev.blink_set =
+                    rt2500pci_blink_set;
+                rt2x00dev->led_qual.flags = LED_INITIALIZED;
         }
 #endif /* CONFIG_RT2500PCI_LEDS */
 
@@ -1882,7 +1892,6 @@ static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {
         .link_stats             = rt2500pci_link_stats,
         .reset_tuner            = rt2500pci_reset_tuner,
         .link_tuner             = rt2500pci_link_tuner,
-        .led_brightness         = rt2500pci_led_brightness,
         .write_tx_desc          = rt2500pci_write_tx_desc,
         .write_tx_data          = rt2x00pci_write_tx_data,
         .kick_tx_queue          = rt2500pci_kick_tx_queue,