Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[deliverable/linux.git] / drivers / net / wireless / b43 / phy_common.c

diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index e176b6e0d9cf08f26dae49baa5b0d729ad13db1d..6d241622210e2d302574679fc656c1d9458973db 100644 (file)
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -84,7 +84,7 @@ int b43_phy_init(struct b43_wldev *dev)
 
        phy->channel = ops->get_default_chan(dev);
 
-       ops->software_rfkill(dev, RFKILL_STATE_UNBLOCKED);
+       ops->software_rfkill(dev, false);
        err = ops->init(dev);
        if (err) {
                b43err(dev->wl, "PHY init failed\n");
@@ -104,7 +104,7 @@ err_phy_exit:
        if (ops->exit)
                ops->exit(dev);
 err_block_rf:
-       ops->software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);
+       ops->software_rfkill(dev, true);
 
        return err;
 }
@@ -113,7 +113,7 @@ void b43_phy_exit(struct b43_wldev *dev)
 {
        const struct b43_phy_operations *ops = dev->phy.ops;
 
-       ops->software_rfkill(dev, RFKILL_STATE_SOFT_BLOCKED);
+       ops->software_rfkill(dev, true);
        if (ops->exit)
                ops->exit(dev);
 }
@@ -295,18 +295,13 @@ err_restore_cookie:
        return err;
 }
 
-void b43_software_rfkill(struct b43_wldev *dev, enum rfkill_state state)
+void b43_software_rfkill(struct b43_wldev *dev, bool blocked)
 {
        struct b43_phy *phy = &dev->phy;
 
-       if (state == RFKILL_STATE_HARD_BLOCKED) {
-               /* We cannot hardware-block the device */
-               state = RFKILL_STATE_SOFT_BLOCKED;
-       }
-
        b43_mac_suspend(dev);
-       phy->ops->software_rfkill(dev, state);
-       phy->radio_on = (state == RFKILL_STATE_UNBLOCKED);
+       phy->ops->software_rfkill(dev, blocked);
+       phy->radio_on = !blocked;
        b43_mac_enable(dev);
 }