1 files changed, 5 insertions, 27 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 9c6d5a929e96..1ee734c14cc1 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -3866,15 +3866,6 @@ enum {
 
 #define TPACPI_RFK_BLUETOOTH_SW_NAME    "tpacpi_bluetooth_sw"
 
-static void bluetooth_suspend(pm_message_t state)
-{
-        /* Try to make sure radio will resume powered off */
-        if (!acpi_evalf(NULL, NULL, "\\BLTH", "vd",
-                   TP_ACPI_BLTH_PWR_OFF_ON_RESUME))
-                vdbg_printk(TPACPI_DBG_RFKILL,
-                        "bluetooth power down on resume request failed\n");
-}
-
 static int bluetooth_get_status(void)
 {
         int status;
@@ -3908,10 +3899,9 @@ static int bluetooth_set_status(enum tpacpi_rfkill_state state)
 #endif
 
         /* We make sure to keep TP_ACPI_BLUETOOTH_RESUMECTRL off */
+        status = TP_ACPI_BLUETOOTH_RESUMECTRL;
         if (state == TPACPI_RFK_RADIO_ON)
-                status = TP_ACPI_BLUETOOTH_RADIOSSW;
-        else
-                status = 0;
+                status |= TP_ACPI_BLUETOOTH_RADIOSSW;
 
         if (!acpi_evalf(hkey_handle, NULL, "SBDC", "vd", status))
                 return -EIO;
@@ -4050,7 +4040,6 @@ static struct ibm_struct bluetooth_driver_data = {
         .read = bluetooth_read,
         .write = bluetooth_write,
         .exit = bluetooth_exit,
-        .suspend = bluetooth_suspend,
         .shutdown = bluetooth_shutdown,
 };
 
@@ -4068,15 +4057,6 @@ enum {
 
 #define TPACPI_RFK_WWAN_SW_NAME         "tpacpi_wwan_sw"
 
-static void wan_suspend(pm_message_t state)
-{
-        /* Try to make sure radio will resume powered off */
-        if (!acpi_evalf(NULL, NULL, "\\WGSV", "qvd",
-                   TP_ACPI_WGSV_PWR_OFF_ON_RESUME))
-                vdbg_printk(TPACPI_DBG_RFKILL,
-                        "WWAN power down on resume request failed\n");
-}
-
 static int wan_get_status(void)
 {
         int status;
@@ -4109,11 +4089,10 @@ static int wan_set_status(enum tpacpi_rfkill_state state)
         }
 #endif
 
-        /* We make sure to keep TP_ACPI_WANCARD_RESUMECTRL off */
+        /* We make sure to set TP_ACPI_WANCARD_RESUMECTRL */
+        status = TP_ACPI_WANCARD_RESUMECTRL;
         if (state == TPACPI_RFK_RADIO_ON)
-                status = TP_ACPI_WANCARD_RADIOSSW;
-        else
-                status = 0;
+                status |= TP_ACPI_WANCARD_RADIOSSW;
 
         if (!acpi_evalf(hkey_handle, NULL, "SWAN", "vd", status))
                 return -EIO;
@@ -4251,7 +4230,6 @@ static struct ibm_struct wan_driver_data = {
         .read = wan_read,
         .write = wan_write,
         .exit = wan_exit,
-        .suspend = wan_suspend,
         .shutdown = wan_shutdown,
 };