4 files changed, 18 insertions, 28 deletions

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index b618fa51db2d..09a503e5da6a 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -988,7 +988,6 @@ static struct rfkill *acer_rfkill_register(struct device *dev,
                                            char *name, u32 cap)
 {
         int err;
-        u32 state;
         struct rfkill *rfkill_dev;
 
         rfkill_dev = rfkill_alloc(name, dev, type,
@@ -996,8 +995,6 @@ static struct rfkill *acer_rfkill_register(struct device *dev,
                                   (void *)(unsigned long)cap);
         if (!rfkill_dev)
                 return ERR_PTR(-ENOMEM);
-        get_u32(&state, cap);
-        rfkill_set_sw_state(rfkill_dev, !state);
 
         err = rfkill_register(rfkill_dev);
         if (err) {
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 1208d0cedd15..03bf522bd7ab 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -675,8 +675,8 @@ static int eeepc_hotk_add(struct acpi_device *device)
                 if (!ehotk->eeepc_wlan_rfkill)
                         goto wlan_fail;
 
-                rfkill_set_global_sw_state(RFKILL_TYPE_WLAN,
-                                           get_acpi(CM_ASL_WLAN) != 1);
+                rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill,
+                                    get_acpi(CM_ASL_WLAN) != 1);
                 result = rfkill_register(ehotk->eeepc_wlan_rfkill);
                 if (result)
                         goto wlan_fail;
@@ -693,8 +693,8 @@ static int eeepc_hotk_add(struct acpi_device *device)
                 if (!ehotk->eeepc_bluetooth_rfkill)
                         goto bluetooth_fail;
 
-                rfkill_set_global_sw_state(RFKILL_TYPE_BLUETOOTH,
-                                           get_acpi(CM_ASL_BLUETOOTH) != 1);
+                rfkill_set_sw_state(ehotk->eeepc_bluetooth_rfkill,
+                                    get_acpi(CM_ASL_BLUETOOTH) != 1);
                 result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
                 if (result)
                         goto bluetooth_fail;
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)
                                            RFKILL_TYPE_WLAN,
                                            &hp_wmi_rfkill_ops,
                                            (void *) 0);
-                rfkill_set_sw_state(wifi_rfkill, hp_wmi_wifi_state());
                 err = rfkill_register(wifi_rfkill);
                 if (err)
                         goto register_wifi_error;
@@ -433,8 +432,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                                                 RFKILL_TYPE_BLUETOOTH,
                                                 &hp_wmi_rfkill_ops,
                                                 (void *) 1);
-                rfkill_set_sw_state(bluetooth_rfkill,
-                                    hp_wmi_bluetooth_state());
                 err = rfkill_register(bluetooth_rfkill);
                 if (err)
                         goto register_bluetooth_error;
@@ -445,7 +442,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                                            RFKILL_TYPE_WWAN,
                                            &hp_wmi_rfkill_ops,
                                            (void *) 2);
-                rfkill_set_sw_state(wwan_rfkill, hp_wmi_wwan_state());
                 err = rfkill_register(wwan_rfkill);
                 if (err)
                         goto register_wwan_err;
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index cfcafa4e9473..86e958539f46 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -1168,21 +1168,6 @@ static int __init tpacpi_new_rfkill(const enum tpacpi_rfk_id id,
 
         BUG_ON(id >= TPACPI_RFK_SW_MAX || tpacpi_rfkill_switches[id]);
 
-        initial_sw_status = (tp_rfkops->get_status)();
-        if (initial_sw_status < 0) {
-                printk(TPACPI_ERR
-                        "failed to read initial state for %s, error %d; "
-                        "will turn radio off\n", name, initial_sw_status);
-        } else {
-                initial_sw_state = (initial_sw_status == TPACPI_RFK_RADIO_OFF);
-                if (set_default) {
-                        /* try to set the initial state as the default for the
-                         * rfkill type, since we ask the firmware to preserve
-                         * it across S5 in NVRAM */
-                        rfkill_set_global_sw_state(rfktype, initial_sw_state);
-                }
-        }
-
         atp_rfk = kzalloc(sizeof(struct tpacpi_rfk), GFP_KERNEL);
         if (atp_rfk)
                 atp_rfk->rfkill = rfkill_alloc(name,
@@ -1200,8 +1185,20 @@ static int __init tpacpi_new_rfkill(const enum tpacpi_rfk_id id,
         atp_rfk->id = id;
         atp_rfk->ops = tp_rfkops;
 
-        rfkill_set_states(atp_rfk->rfkill, initial_sw_state,
-                                tpacpi_rfk_check_hwblock_state());
+        initial_sw_status = (tp_rfkops->get_status)();
+        if (initial_sw_status < 0) {
+                printk(TPACPI_ERR
+                        "failed to read initial state for %s, error %d\n",
+                        name, initial_sw_status);
+        } else {
+                initial_sw_state = (initial_sw_status == TPACPI_RFK_RADIO_OFF);
+                if (set_default) {
+                        /* try to keep the initial state, since we ask the
+                         * firmware to preserve it across S5 in NVRAM */
+                        rfkill_set_sw_state(atp_rfk->rfkill, initial_sw_state);
+                }
+        }
+        rfkill_set_hw_state(atp_rfk->rfkill, tpacpi_rfk_check_hwblock_state());
 
         res = rfkill_register(atp_rfk->rfkill);
         if (res < 0) {