diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-03-27 09:14:31 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:27 -0400 |
commit | 621cac85297de5ba655e3430b007dd2e0da91da6 (patch) | |
tree | 6193ecf0966094bb744fb4238191bcab03a3cdef /drivers/platform/x86/sony-laptop.c | |
parent | c1c6b14b22af0f85d05a70405dc3fba5de840c7b (diff) |
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>
Diffstat (limited to 'drivers/platform/x86/sony-laptop.c')
-rw-r--r-- | drivers/platform/x86/sony-laptop.c | 4 |
1 files changed, 0 insertions, 4 deletions
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) | |||
1097 | sony_wifi_rfkill->name = "sony-wifi"; | 1097 | sony_wifi_rfkill->name = "sony-wifi"; |
1098 | sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set; | 1098 | sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set; |
1099 | sony_wifi_rfkill->get_state = sony_nc_rfkill_get; | 1099 | sony_wifi_rfkill->get_state = sony_nc_rfkill_get; |
1100 | sony_wifi_rfkill->user_claim_unsupported = 1; | ||
1101 | sony_wifi_rfkill->data = (void *)SONY_WIFI; | 1100 | sony_wifi_rfkill->data = (void *)SONY_WIFI; |
1102 | err = rfkill_register(sony_wifi_rfkill); | 1101 | err = rfkill_register(sony_wifi_rfkill); |
1103 | if (err) | 1102 | if (err) |
@@ -1119,7 +1118,6 @@ static int sony_nc_setup_bluetooth_rfkill(struct acpi_device *device) | |||
1119 | sony_bluetooth_rfkill->name = "sony-bluetooth"; | 1118 | sony_bluetooth_rfkill->name = "sony-bluetooth"; |
1120 | sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set; | 1119 | sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set; |
1121 | sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get; | 1120 | sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get; |
1122 | sony_bluetooth_rfkill->user_claim_unsupported = 1; | ||
1123 | sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH; | 1121 | sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH; |
1124 | err = rfkill_register(sony_bluetooth_rfkill); | 1122 | err = rfkill_register(sony_bluetooth_rfkill); |
1125 | if (err) | 1123 | if (err) |
@@ -1140,7 +1138,6 @@ static int sony_nc_setup_wwan_rfkill(struct acpi_device *device) | |||
1140 | sony_wwan_rfkill->name = "sony-wwan"; | 1138 | sony_wwan_rfkill->name = "sony-wwan"; |
1141 | sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set; | 1139 | sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set; |
1142 | sony_wwan_rfkill->get_state = sony_nc_rfkill_get; | 1140 | sony_wwan_rfkill->get_state = sony_nc_rfkill_get; |
1143 | sony_wwan_rfkill->user_claim_unsupported = 1; | ||
1144 | sony_wwan_rfkill->data = (void *)SONY_WWAN; | 1141 | sony_wwan_rfkill->data = (void *)SONY_WWAN; |
1145 | err = rfkill_register(sony_wwan_rfkill); | 1142 | err = rfkill_register(sony_wwan_rfkill); |
1146 | if (err) | 1143 | if (err) |
@@ -1161,7 +1158,6 @@ static int sony_nc_setup_wimax_rfkill(struct acpi_device *device) | |||
1161 | sony_wimax_rfkill->name = "sony-wimax"; | 1158 | sony_wimax_rfkill->name = "sony-wimax"; |
1162 | sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set; | 1159 | sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set; |
1163 | sony_wimax_rfkill->get_state = sony_nc_rfkill_get; | 1160 | sony_wimax_rfkill->get_state = sony_nc_rfkill_get; |
1164 | sony_wimax_rfkill->user_claim_unsupported = 1; | ||
1165 | sony_wimax_rfkill->data = (void *)SONY_WIMAX; | 1161 | sony_wimax_rfkill->data = (void *)SONY_WIMAX; |
1166 | err = rfkill_register(sony_wimax_rfkill); | 1162 | err = rfkill_register(sony_wimax_rfkill); |
1167 | if (err) | 1163 | if (err) |