summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/b43/leds.c
diff options
context:
space:
mode:
authorMichael Buesch <mb@bu3sch.de>2007-09-19 21:10:08 +0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-11 03:52:21 +0400
commit05155c83d13b983ac2c5691575fd471543df31fe (patch)
treee5bd845ab62aef2cdb9fcbf84b25718d455f17b4 /drivers/net/wireless/b43/leds.c
parent6b9bafec6608539d07f7ccdeefe121dabe06604f (diff)
downloadlinux-05155c83d13b983ac2c5691575fd471543df31fe.tar.xz
[B43]: Change loglevel of radio-enable message.
Also cleanup the code a bit and remove the inline. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/b43/leds.c')
-rw-r--r--drivers/net/wireless/b43/leds.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/wireless/b43/leds.c b/drivers/net/wireless/b43/leds.c
index 85d965de5791..0f155b4f34eb 100644
--- a/drivers/net/wireless/b43/leds.c
+++ b/drivers/net/wireless/b43/leds.c
@@ -176,6 +176,7 @@ void b43_leds_update(struct b43_wldev *dev, int activity)
unsigned long interval = 0;
u16 ledctl;
unsigned long flags;
+ bool radio_enabled = (phy->radio_on && dev->radio_hw_enable);
spin_lock_irqsave(&dev->wl->leds_lock, flags);
ledctl = b43_read16(dev, B43_MMIO_GPIO_CONTROL);
@@ -195,21 +196,19 @@ void b43_leds_update(struct b43_wldev *dev, int activity)
turn_on = activity;
break;
case B43_LED_RADIO_ALL:
- turn_on = phy->radio_on && b43_is_hw_radio_enabled(dev);
+ turn_on = radio_enabled;
break;
case B43_LED_RADIO_A:
- turn_on = (phy->radio_on && b43_is_hw_radio_enabled(dev)
- && phy->type == B43_PHYTYPE_A);
+ turn_on = (radio_enabled && phy->type == B43_PHYTYPE_A);
break;
case B43_LED_RADIO_B:
- turn_on = (phy->radio_on && b43_is_hw_radio_enabled(dev)
- && (phy->type == B43_PHYTYPE_B
- || phy->type == B43_PHYTYPE_G));
+ turn_on = (radio_enabled &&
+ (phy->type == B43_PHYTYPE_B
+ || phy->type == B43_PHYTYPE_G));
break;
case B43_LED_MODE_BG:
if (phy->type == B43_PHYTYPE_G
- && b43_is_hw_radio_enabled(dev)
- && 1 /*FIXME: using G rates. */ )
+ && radio_enabled)
turn_on = 1;
break;
case B43_LED_TRANSFER: