aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2007-09-16 18:26:49 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:52:18 -0400
commit01449c5a469c8c1c647cfd3705b1ff290be6afff (patch)
tree00afe5fe347a2fc51f35b7ca6e2346e67b081c49 /drivers
parentfa46081c506ab518e8ea4095bc21b6d544006c00 (diff)
[BCM43XX]: Change radio hardware switch status printk from debug to regular
Some distros ship bcm43xx with debugging printout disabled. For those BCM43xx devices with radio on/off switches, this makes it impossible to know if the radio is on or off. This patch changes a pair of debug printk's into ordinary printk's. It also changes the message that prints when the radio is initialized to the off state as the old message seems to confuse users. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_main.c4
-rw-r--r--drivers/net/wireless/bcm43xx/bcm43xx_radio.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index e038d072398d..45683437a98d 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm)
2380 goto err_gpio_cleanup; 2380 goto err_gpio_cleanup;
2381 bcm43xx_radio_turn_on(bcm); 2381 bcm43xx_radio_turn_on(bcm);
2382 bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm); 2382 bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
2383 dprintk(KERN_INFO PFX "Radio %s by hardware\n", 2383 printk(KERN_INFO PFX "Radio %s by hardware\n",
2384 (bcm->radio_hw_enable == 0) ? "disabled" : "enabled"); 2384 (bcm->radio_hw_enable == 0) ? "disabled" : "enabled");
2385 2385
2386 bcm43xx_write16(bcm, 0x03E6, 0x0000); 2386 bcm43xx_write16(bcm, 0x03E6, 0x0000);
@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(struct bcm43xx_private *bcm)
3129 radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm); 3129 radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);
3130 if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) { 3130 if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {
3131 bcm->radio_hw_enable = radio_hw_enable; 3131 bcm->radio_hw_enable = radio_hw_enable;
3132 dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n", 3132 printk(KERN_INFO PFX "Radio hardware status changed to %s\n",
3133 (radio_hw_enable == 0) ? "disabled" : "enabled"); 3133 (radio_hw_enable == 0) ? "disabled" : "enabled");
3134 bcm43xx_leds_update(bcm, 0); 3134 bcm43xx_leds_update(bcm, 0);
3135 } 3135 }
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
index 6a109f4a1b71..c605099c9baf 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_radio.c
@@ -2146,7 +2146,7 @@ void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm)
2146 } else 2146 } else
2147 bcm43xx_phy_write(bcm, 0x0015, 0xAA00); 2147 bcm43xx_phy_write(bcm, 0x0015, 0xAA00);
2148 radio->enabled = 0; 2148 radio->enabled = 0;
2149 dprintk(KERN_INFO PFX "Radio turned off\n"); 2149 dprintk(KERN_INFO PFX "Radio initialized\n");
2150 bcm43xx_leds_update(bcm, 0); 2150 bcm43xx_leds_update(bcm, 0);
2151} 2151}
2152 2152