Lucas Stach
2016-04-25 07:40:51 UTC
The code to hardcode the LED behavior is basically unchanged from when it
was first merged in 2007. It is likely wrong for many modern systems using
the b43 driver.
On my system the SPROM correctly defines the only wired LED (radio) but
skips all others, leading to the hardcode to register LEDs with RX and TX
triggers. These triggers cause many uneccesary CPU wakeups to drive LEDs
that aren't even present in the system, reducing battery runtime.
Remove the hardcode to stop it from doing any harm. If this code is useful
for others it should probably be reworked as a quirk table triggering only
for individual systems that need it.
Signed-off-by: Lucas Stach <***@lynxeye.de>
---
drivers/net/wireless/broadcom/b43/leds.c | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/leds.c b/drivers/net/wireless/broadcom/b43/leds.c
index d79ab2a..77d2dad 100644
--- a/drivers/net/wireless/broadcom/b43/leds.c
+++ b/drivers/net/wireless/broadcom/b43/leds.c
@@ -224,31 +224,9 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev,
if (sprom[led_index] == 0xFF) {
/* There is no LED information in the SPROM
- * for this LED. Hardcode it here. */
+ * for this LED. Keep it disabled. */
*activelow = false;
- switch (led_index) {
- case 0:
- *behaviour = B43_LED_ACTIVITY;
- *activelow = true;
- if (dev->dev->board_vendor == PCI_VENDOR_ID_COMPAQ)
- *behaviour = B43_LED_RADIO_ALL;
- break;
- case 1:
- *behaviour = B43_LED_RADIO_B;
- if (dev->dev->board_vendor == PCI_VENDOR_ID_ASUSTEK)
- *behaviour = B43_LED_ASSOC;
- break;
- case 2:
- *behaviour = B43_LED_RADIO_A;
- break;
- case 3:
- *behaviour = B43_LED_OFF;
- break;
- default:
- *behaviour = B43_LED_OFF;
- B43_WARN_ON(1);
- return;
- }
+ *behaviour = B43_LED_OFF;
} else {
*behaviour = sprom[led_index] & B43_LED_BEHAVIOUR;
*activelow = !!(sprom[led_index] & B43_LED_ACTIVELOW);
was first merged in 2007. It is likely wrong for many modern systems using
the b43 driver.
On my system the SPROM correctly defines the only wired LED (radio) but
skips all others, leading to the hardcode to register LEDs with RX and TX
triggers. These triggers cause many uneccesary CPU wakeups to drive LEDs
that aren't even present in the system, reducing battery runtime.
Remove the hardcode to stop it from doing any harm. If this code is useful
for others it should probably be reworked as a quirk table triggering only
for individual systems that need it.
Signed-off-by: Lucas Stach <***@lynxeye.de>
---
drivers/net/wireless/broadcom/b43/leds.c | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/leds.c b/drivers/net/wireless/broadcom/b43/leds.c
index d79ab2a..77d2dad 100644
--- a/drivers/net/wireless/broadcom/b43/leds.c
+++ b/drivers/net/wireless/broadcom/b43/leds.c
@@ -224,31 +224,9 @@ static void b43_led_get_sprominfo(struct b43_wldev *dev,
if (sprom[led_index] == 0xFF) {
/* There is no LED information in the SPROM
- * for this LED. Hardcode it here. */
+ * for this LED. Keep it disabled. */
*activelow = false;
- switch (led_index) {
- case 0:
- *behaviour = B43_LED_ACTIVITY;
- *activelow = true;
- if (dev->dev->board_vendor == PCI_VENDOR_ID_COMPAQ)
- *behaviour = B43_LED_RADIO_ALL;
- break;
- case 1:
- *behaviour = B43_LED_RADIO_B;
- if (dev->dev->board_vendor == PCI_VENDOR_ID_ASUSTEK)
- *behaviour = B43_LED_ASSOC;
- break;
- case 2:
- *behaviour = B43_LED_RADIO_A;
- break;
- case 3:
- *behaviour = B43_LED_OFF;
- break;
- default:
- *behaviour = B43_LED_OFF;
- B43_WARN_ON(1);
- return;
- }
+ *behaviour = B43_LED_OFF;
} else {
*behaviour = sprom[led_index] & B43_LED_BEHAVIOUR;
*activelow = !!(sprom[led_index] & B43_LED_ACTIVELOW);
--
2.5.5
2.5.5