diff options
author | Alan Jenkins <alan-jenkins@tuffmail.co.uk> | 2009-06-08 08:27:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-06-10 13:28:37 -0400 |
commit | b3fa1329eaf2a7b97124dacf5b663fd51346ac19 (patch) | |
tree | 93fd6a76af00568e8317e3e4f084135379ec6c25 /drivers/platform/x86/hp-wmi.c | |
parent | 8f77f3849cc3ae2d6df9301785a3d316ea7d7ee1 (diff) |
rfkill: remove set_global_sw_state
rfkill_set_global_sw_state() (previously rfkill_set_default()) will no
longer be exported by the rewritten rfkill core.
Instead, platform drivers which can provide persistent soft-rfkill state
across power-down/reboot should indicate their initial state by calling
rfkill_set_sw_state() before registration. Otherwise, they will be
initialized to a default value during registration by a set_block call.
We remove existing calls to rfkill_set_sw_state() which happen before
registration, since these had no effect in the old model. If these
drivers do have persistent state, the calls can be put back (subject
to testing :-). This affects hp-wmi and acer-wmi.
Drivers with persistent state will affect the global state only if
rfkill-input is enabled. This is required, otherwise booting with
wireless soft-blocked and pressing the wireless-toggle key once would
have no apparent effect. This special case will be removed in future
along with rfkill-input, in favour of a more flexible userspace daemon
(see Documentation/feature-removal-schedule.txt).
Now rfkill_global_states[n].def is only used to preserve global states
over EPO, it is renamed to ".sav".
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/platform/x86/hp-wmi.c')
-rw-r--r-- | drivers/platform/x86/hp-wmi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 8d931145cbfa..16fffe44e333 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c | |||
@@ -422,7 +422,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
422 | RFKILL_TYPE_WLAN, | 422 | RFKILL_TYPE_WLAN, |
423 | &hp_wmi_rfkill_ops, | 423 | &hp_wmi_rfkill_ops, |
424 | (void *) 0); | 424 | (void *) 0); |
425 | rfkill_set_sw_state(wifi_rfkill, hp_wmi_wifi_state()); | ||
426 | err = rfkill_register(wifi_rfkill); | 425 | err = rfkill_register(wifi_rfkill); |
427 | if (err) | 426 | if (err) |
428 | goto register_wifi_error; | 427 | goto register_wifi_error; |
@@ -433,8 +432,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
433 | RFKILL_TYPE_BLUETOOTH, | 432 | RFKILL_TYPE_BLUETOOTH, |
434 | &hp_wmi_rfkill_ops, | 433 | &hp_wmi_rfkill_ops, |
435 | (void *) 1); | 434 | (void *) 1); |
436 | rfkill_set_sw_state(bluetooth_rfkill, | ||
437 | hp_wmi_bluetooth_state()); | ||
438 | err = rfkill_register(bluetooth_rfkill); | 435 | err = rfkill_register(bluetooth_rfkill); |
439 | if (err) | 436 | if (err) |
440 | goto register_bluetooth_error; | 437 | goto register_bluetooth_error; |
@@ -445,7 +442,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) | |||
445 | RFKILL_TYPE_WWAN, | 442 | RFKILL_TYPE_WWAN, |
446 | &hp_wmi_rfkill_ops, | 443 | &hp_wmi_rfkill_ops, |
447 | (void *) 2); | 444 | (void *) 2); |
448 | rfkill_set_sw_state(wwan_rfkill, hp_wmi_wwan_state()); | ||
449 | err = rfkill_register(wwan_rfkill); | 445 | err = rfkill_register(wwan_rfkill); |
450 | if (err) | 446 | if (err) |
451 | goto register_wwan_err; | 447 | goto register_wwan_err; |