diff options
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/acer-wmi.c | 1 | ||||
-rw-r--r-- | drivers/platform/x86/hp-wmi.c | 3 | ||||
-rw-r--r-- | drivers/platform/x86/sony-laptop.c | 4 | ||||
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 1 |
4 files changed, 0 insertions, 9 deletions
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) | |||
1005 | *data = cap; | 1005 | *data = cap; |
1006 | rfkill_dev->data = data; | 1006 | rfkill_dev->data = data; |
1007 | rfkill_dev->toggle_radio = acer_rfkill_set; | 1007 | rfkill_dev->toggle_radio = acer_rfkill_set; |
1008 | rfkill_dev->user_claim_unsupported = 1; | ||
1009 | 1008 | ||
1010 | err = rfkill_register(rfkill_dev); | 1009 | err = rfkill_register(rfkill_dev); |
1011 | if (err) { | 1010 | 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) | |||
434 | wifi_rfkill->name = "hp-wifi"; | 434 | wifi_rfkill->name = "hp-wifi"; |
435 | wifi_rfkill->state = hp_wmi_wifi_state(); | 435 | wifi_rfkill->state = hp_wmi_wifi_state(); |
436 | wifi_rfkill->toggle_radio = hp_wmi_wifi_set; | 436 | wifi_rfkill->toggle_radio = hp_wmi_wifi_set; |
437 | wifi_rfkill->user_claim_unsupported = 1; | ||
438 | err = rfkill_register(wifi_rfkill); | 437 | err = rfkill_register(wifi_rfkill); |
439 | if (err) | 438 | if (err) |
440 | goto add_sysfs_error; | 439 | goto add_sysfs_error; |
@@ -446,7 +445,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
446 | bluetooth_rfkill->name = "hp-bluetooth"; | 445 | bluetooth_rfkill->name = "hp-bluetooth"; |
447 | bluetooth_rfkill->state = hp_wmi_bluetooth_state(); | 446 | bluetooth_rfkill->state = hp_wmi_bluetooth_state(); |
448 | bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; | 447 | bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set; |
449 | bluetooth_rfkill->user_claim_unsupported = 1; | ||
450 | err = rfkill_register(bluetooth_rfkill); | 448 | err = rfkill_register(bluetooth_rfkill); |
451 | if (err) | 449 | if (err) |
452 | goto register_bluetooth_error; | 450 | goto register_bluetooth_error; |
@@ -457,7 +455,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
457 | wwan_rfkill->name = "hp-wwan"; | 455 | wwan_rfkill->name = "hp-wwan"; |
458 | wwan_rfkill->state = hp_wmi_wwan_state(); | 456 | wwan_rfkill->state = hp_wmi_wwan_state(); |
459 | wwan_rfkill->toggle_radio = hp_wmi_wwan_set; | 457 | wwan_rfkill->toggle_radio = hp_wmi_wwan_set; |
460 | wwan_rfkill->user_claim_unsupported = 1; | ||
461 | err = rfkill_register(wwan_rfkill); | 458 | err = rfkill_register(wwan_rfkill); |
462 | if (err) | 459 | if (err) |
463 | goto register_wwan_err; | 460 | goto register_wwan_err; |
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 552958545f94..f1963b05175b 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
@@ -1098,7 +1098,6 @@ static int sony_nc_setup_wifi_rfkill(struct acpi_device *device) | |||
1098 | sony_wifi_rfkill->name = "sony-wifi"; | 1098 | sony_wifi_rfkill->name = "sony-wifi"; |
1099 | sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set; | 1099 | sony_wifi_rfkill->toggle_radio = sony_nc_rfkill_set; |
1100 | sony_wifi_rfkill->get_state = sony_nc_rfkill_get; | 1100 | sony_wifi_rfkill->get_state = sony_nc_rfkill_get; |
1101 | sony_wifi_rfkill->user_claim_unsupported = 1; | ||
1102 | sony_wifi_rfkill->data = (void *)SONY_WIFI; | 1101 | sony_wifi_rfkill->data = (void *)SONY_WIFI; |
1103 | err = rfkill_register(sony_wifi_rfkill); | 1102 | err = rfkill_register(sony_wifi_rfkill); |
1104 | if (err) | 1103 | if (err) |
@@ -1123,7 +1122,6 @@ static int sony_nc_setup_bluetooth_rfkill(struct acpi_device *device) | |||
1123 | sony_bluetooth_rfkill->name = "sony-bluetooth"; | 1122 | sony_bluetooth_rfkill->name = "sony-bluetooth"; |
1124 | sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set; | 1123 | sony_bluetooth_rfkill->toggle_radio = sony_nc_rfkill_set; |
1125 | sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get; | 1124 | sony_bluetooth_rfkill->get_state = sony_nc_rfkill_get; |
1126 | sony_bluetooth_rfkill->user_claim_unsupported = 1; | ||
1127 | sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH; | 1125 | sony_bluetooth_rfkill->data = (void *)SONY_BLUETOOTH; |
1128 | err = rfkill_register(sony_bluetooth_rfkill); | 1126 | err = rfkill_register(sony_bluetooth_rfkill); |
1129 | if (err) | 1127 | if (err) |
@@ -1147,7 +1145,6 @@ static int sony_nc_setup_wwan_rfkill(struct acpi_device *device) | |||
1147 | sony_wwan_rfkill->name = "sony-wwan"; | 1145 | sony_wwan_rfkill->name = "sony-wwan"; |
1148 | sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set; | 1146 | sony_wwan_rfkill->toggle_radio = sony_nc_rfkill_set; |
1149 | sony_wwan_rfkill->get_state = sony_nc_rfkill_get; | 1147 | sony_wwan_rfkill->get_state = sony_nc_rfkill_get; |
1150 | sony_wwan_rfkill->user_claim_unsupported = 1; | ||
1151 | sony_wwan_rfkill->data = (void *)SONY_WWAN; | 1148 | sony_wwan_rfkill->data = (void *)SONY_WWAN; |
1152 | err = rfkill_register(sony_wwan_rfkill); | 1149 | err = rfkill_register(sony_wwan_rfkill); |
1153 | if (err) | 1150 | if (err) |
@@ -1171,7 +1168,6 @@ static int sony_nc_setup_wimax_rfkill(struct acpi_device *device) | |||
1171 | sony_wimax_rfkill->name = "sony-wimax"; | 1168 | sony_wimax_rfkill->name = "sony-wimax"; |
1172 | sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set; | 1169 | sony_wimax_rfkill->toggle_radio = sony_nc_rfkill_set; |
1173 | sony_wimax_rfkill->get_state = sony_nc_rfkill_get; | 1170 | sony_wimax_rfkill->get_state = sony_nc_rfkill_get; |
1174 | sony_wimax_rfkill->user_claim_unsupported = 1; | ||
1175 | sony_wimax_rfkill->data = (void *)SONY_WIMAX; | 1171 | sony_wimax_rfkill->data = (void *)SONY_WIMAX; |
1176 | err = rfkill_register(sony_wimax_rfkill); | 1172 | err = rfkill_register(sony_wimax_rfkill); |
1177 | if (err) | 1173 | 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) | |||
803 | 803 | ||
804 | toshiba_acpi.rfk_dev->name = toshiba_acpi.bt_name; | 804 | toshiba_acpi.rfk_dev->name = toshiba_acpi.bt_name; |
805 | toshiba_acpi.rfk_dev->toggle_radio = bt_rfkill_toggle_radio; | 805 | toshiba_acpi.rfk_dev->toggle_radio = bt_rfkill_toggle_radio; |
806 | toshiba_acpi.rfk_dev->user_claim_unsupported = 1; | ||
807 | toshiba_acpi.rfk_dev->data = &toshiba_acpi; | 806 | toshiba_acpi.rfk_dev->data = &toshiba_acpi; |
808 | 807 | ||
809 | if (hci_get_bt_on(&bt_on) == HCI_SUCCESS && bt_on) { | 808 | if (hci_get_bt_on(&bt_on) == HCI_SUCCESS && bt_on) { |