Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01449c5a authored by Larry Finger's avatar Larry Finger Committed by David S. Miller
Browse files

[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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fa46081c

drivers/net/wireless/bcm43xx/bcm43xx_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2380,7 +2380,7 @@ static int bcm43xx_chip_init(struct bcm43xx_private *bcm) 
		goto err_gpio_cleanup;

	bcm43xx_radio_turn_on(bcm);

	bcm->radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);

	dprintk(KERN_INFO PFX "Radio %s by hardware\n",

	printk(KERN_INFO PFX "Radio %s by hardware\n",

		(bcm->radio_hw_enable == 0) ? "disabled" : "enabled");



	bcm43xx_write16(bcm, 0x03E6, 0x0000);
@@ -3129,7 +3129,7 @@ static void bcm43xx_periodic_every1sec(struct bcm43xx_private *bcm) 
	radio_hw_enable = bcm43xx_is_hw_radio_enabled(bcm);

	if (unlikely(bcm->radio_hw_enable != radio_hw_enable)) {

		bcm->radio_hw_enable = radio_hw_enable;

		dprintk(KERN_INFO PFX "Radio hardware status changed to %s\n",

		printk(KERN_INFO PFX "Radio hardware status changed to %s\n",

		       (radio_hw_enable == 0) ? "disabled" : "enabled");

		bcm43xx_leds_update(bcm, 0);

	}

drivers/net/wireless/bcm43xx/bcm43xx_radio.c

+1 −1
Original line number Diff line number Diff line
@@ -2146,7 +2146,7 @@ void bcm43xx_radio_turn_off(struct bcm43xx_private *bcm) 
	} else

		bcm43xx_phy_write(bcm, 0x0015, 0xAA00);

	radio->enabled = 0;

	dprintk(KERN_INFO PFX "Radio turned off\n");

	dprintk(KERN_INFO PFX "Radio initialized\n");

	bcm43xx_leds_update(bcm, 0);

}