b43: Convert usage of b43_phy_maskset()

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / b43 / rfkill.c

diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index 34ae125d5384dadf769b0134aa0a878af471fc17..713753781f4007eb44ec93090f40c27e452474a1 100644 (file)
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -24,6 +24,7 @@
 
 #include "rfkill.h"
 #include "b43.h"
+#include "phy_common.h"
 
 #include <linux/kmod.h>
 
@@ -96,11 +97,11 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
                        goto out_unlock;
                }
                if (!dev->phy.radio_on)
-                       b43_radio_turn_on(dev);
+                       b43_software_rfkill(dev, state);
                break;
        case RFKILL_STATE_SOFT_BLOCKED:
                if (dev->phy.radio_on)
-                       b43_radio_turn_off(dev, 0);
+                       b43_software_rfkill(dev, state);
                break;
        default:
                b43warn(wl, "Received unexpected rfkill state %d.\n", state);
@@ -169,6 +170,11 @@ void b43_rfkill_init(struct b43_wldev *dev)
                        "The built-in radio LED will not work.\n");
 #endif /* CONFIG_RFKILL_INPUT */
 
+#if !defined(CONFIG_RFKILL_INPUT) && !defined(CONFIG_RFKILL_INPUT_MODULE)
+       b43warn(wl, "The rfkill-input subsystem is not available. "
+               "The built-in radio LED will not work.\n");
+#endif
+
        err = input_register_polled_device(rfk->poll_dev);
        if (err)
                goto err_unreg_rfk;