rfkill: remove user_claim stuff

Almost all drivers do not support user_claim, so remove it
completely and always report -EOPNOTSUPP to userspace. Since
userspace cannot really drive rfkill _anyway_ (due to the
odd restrictions imposed by the documentation) having this
code is just pointless.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

8 files changed, 0 insertions, 13 deletions

diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index 13d4e6756c99..0607df20e497 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -1267,7 +1267,6 @@ static int ath_init_sw_rfkill(struct ath_softc *sc)
         sc->rf_kill.rfkill->data = sc;
         sc->rf_kill.rfkill->toggle_radio = ath_sw_toggle_radio;
         sc->rf_kill.rfkill->state = RFKILL_STATE_UNBLOCKED;
-        sc->rf_kill.rfkill->user_claim_unsupported = 1;
 
         return 0;
 }
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
index afad42358693..9e1d00bc24d3 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -139,7 +139,6 @@ void b43_rfkill_init(struct b43_wldev *dev)
         rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
         rfk->rfkill->data = dev;
         rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle;
-        rfk->rfkill->user_claim_unsupported = 1;
 
         rfk->poll_dev = input_allocate_polled_device();
         if (!rfk->poll_dev) {
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
index b32bf6a94f19..4b0c7d27a51f 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -142,7 +142,6 @@ void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
         rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
         rfk->rfkill->data = dev;
         rfk->rfkill->toggle_radio = b43legacy_rfkill_soft_toggle;
-        rfk->rfkill->user_claim_unsupported = 1;
 
         rfk->poll_dev = input_allocate_polled_device();
         if (!rfk->poll_dev) {
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index 2ad9faf1508a..65605ad44e4b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -91,7 +91,6 @@ int iwl_rfkill_init(struct iwl_priv *priv)
         priv->rfkill->data = priv;
         priv->rfkill->state = RFKILL_STATE_UNBLOCKED;
         priv->rfkill->toggle_radio = iwl_rfkill_soft_rf_kill;
-        priv->rfkill->user_claim_unsupported = 1;
 
         priv->rfkill->dev.class->suspend = NULL;
         priv->rfkill->dev.class->resume = NULL;
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 0f6e43bf4fc2..62d02b3c998e 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -1005,7 +1005,6 @@ enum rfkill_type type, char *name, u32 cap)
         *data = cap;
         rfkill_dev->data = data;
         rfkill_dev->toggle_radio = acer_rfkill_set;
-        rfkill_dev->user_claim_unsupported = 1;
 
         err = rfkill_register(rfkill_dev);
         if (err) {
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 50d9019de2be..fe171fad12cf 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -434,7 +434,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                 wifi_rfkill->name = "hp-wifi";
                 wifi_rfkill->state = hp_wmi_wifi_state();
                 wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
-                wifi_rfkill->user_claim_unsupported = 1;
                 err = rfkill_register(wifi_rfkill);
                 if (err)
                         goto add_sysfs_error;
@@ -446,7 +445,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                 bluetooth_rfkill->name = "hp-bluetooth";
                 bluetooth_rfkill->state = hp_wmi_bluetooth_state();
                 bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
-                bluetooth_rfkill->user_claim_unsupported = 1;
                 err = rfkill_register(bluetooth_rfkill);
                 if (err)
                         goto register_bluetooth_error;
@@ -457,7 +455,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                 wwan_rfkill->name = "hp-wwan";
                 wwan_rfkill->state = hp_wmi_wwan_state();
                 wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
-                wwan_rfkill->user_claim_unsupported = 1;
                 err = rfkill_register(wwan_rfkill);
                 if (err)
                         goto register_wwan_err;
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index d3c92d777bde..184e99e72684 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -1097,7 +1097,6 @@ static int sony_nc_setup_wifi_rfkill(struct acpi_device *device)
         sony_wifi_rfkill->name = "sony-wifi";
         sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set;
         sony_wifi_rfkill->get_state = sony_nc_rfkill_get;
-        sony_wifi_rfkill->user_claim_unsupported = 1;
         sony_wifi_rfkill->data = (void *)SONY_WIFI;
         err = rfkill_register(sony_wifi_rfkill);
         if (err)
@@ -1119,7 +1118,6 @@ static int sony_nc_setup_bluetooth_rfkill(struct acpi_device *device)
         sony_bluetooth_rfkill->name = "sony-bluetooth";
         sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set;
         sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get;
-        sony_bluetooth_rfkill->user_claim_unsupported = 1;
         sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH;
         err = rfkill_register(sony_bluetooth_rfkill);
         if (err)
@@ -1140,7 +1138,6 @@ static int sony_nc_setup_wwan_rfkill(struct acpi_device *device)
         sony_wwan_rfkill->name = "sony-wwan";
         sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set;
         sony_wwan_rfkill->get_state = sony_nc_rfkill_get;
-        sony_wwan_rfkill->user_claim_unsupported = 1;
         sony_wwan_rfkill->data = (void *)SONY_WWAN;
         err = rfkill_register(sony_wwan_rfkill);
         if (err)
@@ -1161,7 +1158,6 @@ static int sony_nc_setup_wimax_rfkill(struct acpi_device *device)
         sony_wimax_rfkill->name = "sony-wimax";
         sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set;
         sony_wimax_rfkill->get_state = sony_nc_rfkill_get;
-        sony_wimax_rfkill->user_claim_unsupported = 1;
         sony_wimax_rfkill->data = (void *)SONY_WIMAX;
         err = rfkill_register(sony_wimax_rfkill);
         if (err)
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 9f187265db8e..4345089f5171 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -803,7 +803,6 @@ static int __init toshiba_acpi_init(void)
 
                 toshiba_acpi.rfk_dev->name = toshiba_acpi.bt_name;
                 toshiba_acpi.rfk_dev->toggle_radio = bt_rfkill_toggle_radio;
-                toshiba_acpi.rfk_dev->user_claim_unsupported = 1;
                 toshiba_acpi.rfk_dev->data = &toshiba_acpi;
 
                 if (hci_get_bt_on(&bt_on) == HCI_SUCCESS && bt_on) {