rt2x00: Make use of MAC80211_LED_TRIGGERS

Make use of the led triggers provided by mac80211 to control
the led status. This can be enabled through a per-driver
configuration option which will automatically enable the
generic handler in rt2x00lib.

This has been enabled for rt2500usb and rt73usb for the moment
since the led class will call set_brightness in irq context which
will not work correctly with the usb drivers who need to sleep.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 48 insertions, 40 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index 36c64f751b1d..bb359a14b4ae 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -243,6 +243,30 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)
 #define rt2500pci_rfkill_poll   NULL
 #endif /* CONFIG_RT2500PCI_RFKILL */
 
+#ifdef CONFIG_RT2500PCI_LEDS
+static void rt2500pci_led_brightness(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) {
+                rt2x00_set_field32(&reg, LEDCSR_LINK, enabled);
+                rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, enabled && activity);
+        }
+
+        rt2x00pci_register_write(led->rt2x00dev, LEDCSR, reg);
+}
+#else
+#define rt2500pci_led_brightness        NULL
+#endif /* CONFIG_RT2500PCI_LEDS */
+
 /*
  * Configuration handlers.
  */
@@ -549,34 +573,6 @@ static void rt2500pci_config(struct rt2x00_dev *rt2x00dev,
 }
 
 /*
- * LED functions.
- */
-static void rt2500pci_enable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-
-        rt2x00_set_field32(&reg, LEDCSR_ON_PERIOD, 70);
-        rt2x00_set_field32(&reg, LEDCSR_OFF_PERIOD, 30);
-        rt2x00_set_field32(&reg, LEDCSR_LINK,
-                           (rt2x00dev->led_mode != LED_MODE_ASUS));
-        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY,
-                           (rt2x00dev->led_mode != LED_MODE_TXRX_ACTIVITY));
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-}
-
-static void rt2500pci_disable_led(struct rt2x00_dev *rt2x00dev)
-{
-        u32 reg;
-
-        rt2x00pci_register_read(rt2x00dev, LEDCSR, &reg);
-        rt2x00_set_field32(&reg, LEDCSR_LINK, 0);
-        rt2x00_set_field32(&reg, LEDCSR_ACTIVITY, 0);
-        rt2x00pci_register_write(rt2x00dev, LEDCSR, reg);
-}
-
-/*
  * Link tuning
  */
 static void rt2500pci_link_stats(struct rt2x00_dev *rt2x00dev,
@@ -795,6 +791,11 @@ 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);
@@ -1026,11 +1027,6 @@ static int rt2500pci_enable_radio(struct rt2x00_dev *rt2x00dev)
          */
         rt2500pci_toggle_irq(rt2x00dev, STATE_RADIO_IRQ_ON);
 
-        /*
-         * Enable LED
-         */
-        rt2500pci_enable_led(rt2x00dev);
-
         return 0;
 }
 
@@ -1038,11 +1034,6 @@ static void rt2500pci_disable_radio(struct rt2x00_dev *rt2x00dev)
 {
         u32 reg;
 
-        /*
-         * Disable LED
-         */
-        rt2500pci_disable_led(rt2x00dev);
-
         rt2x00pci_register_write(rt2x00dev, PWRCSR0, 0);
 
         /*
@@ -1445,8 +1436,24 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev)
         /*
          * Store led mode, for correct led behaviour.
          */
-        rt2x00dev->led_mode =
-            rt2x00_get_field16(eeprom, EEPROM_ANTENNA_LED_MODE);
+#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;
+        }
+#endif /* CONFIG_RT2500PCI_LEDS */
 
         /*
          * Detect if this device has an hardware controlled radio.
@@ -1906,6 +1913,7 @@ 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,