b43legacy: Convert to use of the new SPROM structure

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43legacy / leds.c

diff --git a/drivers/net/wireless/b43legacy/leds.c b/drivers/net/wireless/b43legacy/leds.c
index 1e30919582c55301e0ae46fc238c88eeab1832a2..f0affb781002dc2d9cafb350e322ca022b5011d6 100644 (file)
--- a/drivers/net/wireless/b43legacy/leds.c
+++ b/drivers/net/wireless/b43legacy/leds.c
@@ -4,7 +4,7 @@
   LED control
 
   Copyright (c) 2005 Martin Langer <martin-langer@gmx.de>,
-  Copyright (c) 2005 Stefano Brivio <st3@riseup.net>
+  Copyright (c) 2005 Stefano Brivio <stefano.brivio@polimi.it>
   Copyright (c) 2005-2007 Michael Buesch <mb@bu3sch.de>
   Copyright (c) 2005 Danny van Dyk <kugelfang@gentoo.org>
   Copyright (c) 2005 Andreas Jaggi <andreas.jaggi@waterwave.ch>
@@ -156,12 +156,16 @@ static void b43legacy_map_led(struct b43legacy_wldev *dev,
                                 ieee80211_get_rx_led_name(hw),
                                 led_index, activelow);
                break;
-       /*FIXME: We need another trigger for the "radio-on" LEDs below.
-        *       Wiggle that somehow into the rfkill subsystem. */
        case B43legacy_LED_RADIO_ALL:
        case B43legacy_LED_RADIO_A:
        case B43legacy_LED_RADIO_B:
        case B43legacy_LED_MODE_BG:
+               snprintf(name, sizeof(name),
+                        "b43legacy-%s:radio", wiphy_name(hw->wiphy));
+               b43legacy_register_led(dev, &dev->led_radio, name,
+                                b43legacy_rfkill_led_name(dev),
+                                led_index, activelow);
+               break;
        case B43legacy_LED_WEIRD:
        case B43legacy_LED_ASSOC:
                snprintf(name, sizeof(name),
@@ -185,10 +189,10 @@ void b43legacy_leds_init(struct b43legacy_wldev *dev)
        enum b43legacy_led_behaviour behaviour;
        bool activelow;
 
-       sprom[0] = bus->sprom.r1.gpio0;
-       sprom[1] = bus->sprom.r1.gpio1;
-       sprom[2] = bus->sprom.r1.gpio2;
-       sprom[3] = bus->sprom.r1.gpio3;
+       sprom[0] = bus->sprom.gpio0;
+       sprom[1] = bus->sprom.gpio1;
+       sprom[2] = bus->sprom.gpio2;
+       sprom[3] = bus->sprom.gpio3;
 
        for (i = 0; i < 4; i++) {
                if (sprom[i] == 0xFF) {