Merge tag 'platform-drivers-x86-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / drivers / platform / x86 / ideapad-laptop.c

diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c
index 959ec3c5f376e737f0b9d2c0e566b291160cd226..d2fee9a3e2390a23f38e5d6dfa3388ef56cb0797 100644 (file)
--- a/drivers/platform/x86/ideapad-laptop.c
+++ b/drivers/platform/x86/ideapad-laptop.c
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
-#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
 #include <linux/module.h>
@@ -31,6 +30,7 @@
 #include <linux/sysfs.h>
 #include <linux/types.h>
 #include <linux/wmi.h>
+#include "ideapad-laptop.h"
 
 #include <acpi/video.h>
 
@@ -85,33 +85,6 @@ enum {
        SALS_FNLOCK_OFF       = 0xf,
 };
 
-enum {
-       VPCCMD_R_VPC1 = 0x10,
-       VPCCMD_R_BL_MAX,
-       VPCCMD_R_BL,
-       VPCCMD_W_BL,
-       VPCCMD_R_WIFI,
-       VPCCMD_W_WIFI,
-       VPCCMD_R_BT,
-       VPCCMD_W_BT,
-       VPCCMD_R_BL_POWER,
-       VPCCMD_R_NOVO,
-       VPCCMD_R_VPC2,
-       VPCCMD_R_TOUCHPAD,
-       VPCCMD_W_TOUCHPAD,
-       VPCCMD_R_CAMERA,
-       VPCCMD_W_CAMERA,
-       VPCCMD_R_3G,
-       VPCCMD_W_3G,
-       VPCCMD_R_ODD, /* 0x21 */
-       VPCCMD_W_FAN,
-       VPCCMD_R_RF,
-       VPCCMD_W_RF,
-       VPCCMD_R_FAN = 0x2B,
-       VPCCMD_R_SPECIAL_BUTTONS = 0x31,
-       VPCCMD_W_BL_POWER = 0x33,
-};
-
 struct ideapad_dytc_priv {
        enum platform_profile_option current_profile;
        struct platform_profile_handler pprof;
@@ -227,7 +200,6 @@ static void ideapad_shared_exit(struct ideapad_private *priv)
 /*
  * ACPI Helpers
  */
-#define IDEAPAD_EC_TIMEOUT 200 /* in ms */
 
 static int eval_int(acpi_handle handle, const char *name, unsigned long *res)
 {
@@ -270,116 +242,11 @@ static int exec_sals(acpi_handle handle, unsigned long arg)
        return exec_simple_method(handle, "SALS", arg);
 }
 
-static int eval_int_with_arg(acpi_handle handle, const char *name, unsigned long arg, unsigned long *res)
-{
-       struct acpi_object_list params;
-       unsigned long long result;
-       union acpi_object in_obj;
-       acpi_status status;
-
-       params.count = 1;
-       params.pointer = &in_obj;
-       in_obj.type = ACPI_TYPE_INTEGER;
-       in_obj.integer.value = arg;
-
-       status = acpi_evaluate_integer(handle, (char *)name, &params, &result);
-       if (ACPI_FAILURE(status))
-               return -EIO;
-
-       if (res)
-               *res = result;
-
-       return 0;
-}
-
 static int eval_dytc(acpi_handle handle, unsigned long cmd, unsigned long *res)
 {
        return eval_int_with_arg(handle, "DYTC", cmd, res);
 }
 
-static int eval_vpcr(acpi_handle handle, unsigned long cmd, unsigned long *res)
-{
-       return eval_int_with_arg(handle, "VPCR", cmd, res);
-}
-
-static int eval_vpcw(acpi_handle handle, unsigned long cmd, unsigned long data)
-{
-       struct acpi_object_list params;
-       union acpi_object in_obj[2];
-       acpi_status status;
-
-       params.count = 2;
-       params.pointer = in_obj;
-       in_obj[0].type = ACPI_TYPE_INTEGER;
-       in_obj[0].integer.value = cmd;
-       in_obj[1].type = ACPI_TYPE_INTEGER;
-       in_obj[1].integer.value = data;
-
-       status = acpi_evaluate_object(handle, "VPCW", &params, NULL);
-       if (ACPI_FAILURE(status))
-               return -EIO;
-
-       return 0;
-}
-
-static int read_ec_data(acpi_handle handle, unsigned long cmd, unsigned long *data)
-{
-       unsigned long end_jiffies, val;
-       int err;
-
-       err = eval_vpcw(handle, 1, cmd);
-       if (err)
-               return err;
-
-       end_jiffies = jiffies + msecs_to_jiffies(IDEAPAD_EC_TIMEOUT) + 1;
-
-       while (time_before(jiffies, end_jiffies)) {
-               schedule();
-
-               err = eval_vpcr(handle, 1, &val);
-               if (err)
-                       return err;
-
-               if (val == 0)
-                       return eval_vpcr(handle, 0, data);
-       }
-
-       acpi_handle_err(handle, "timeout in %s\n", __func__);
-
-       return -ETIMEDOUT;
-}
-
-static int write_ec_cmd(acpi_handle handle, unsigned long cmd, unsigned long data)
-{
-       unsigned long end_jiffies, val;
-       int err;
-
-       err = eval_vpcw(handle, 0, data);
-       if (err)
-               return err;
-
-       err = eval_vpcw(handle, 1, cmd);
-       if (err)
-               return err;
-
-       end_jiffies = jiffies + msecs_to_jiffies(IDEAPAD_EC_TIMEOUT) + 1;
-
-       while (time_before(jiffies, end_jiffies)) {
-               schedule();
-
-               err = eval_vpcr(handle, 1, &val);
-               if (err)
-                       return err;
-
-               if (val == 0)
-                       return 0;
-       }
-
-       acpi_handle_err(handle, "timeout in %s\n", __func__);
-
-       return -ETIMEDOUT;
-}
-
 /*
  * debugfs
  */
@@ -1918,7 +1785,7 @@ input_failed:
        return err;
 }
 
-static int ideapad_acpi_remove(struct platform_device *pdev)
+static void ideapad_acpi_remove(struct platform_device *pdev)
 {
        struct ideapad_private *priv = dev_get_drvdata(&pdev->dev);
        int i;
@@ -1939,8 +1806,6 @@ static int ideapad_acpi_remove(struct platform_device *pdev)
        ideapad_input_exit(priv);
        ideapad_debugfs_exit(priv);
        ideapad_sysfs_exit(priv);
-
-       return 0;
 }
 
 #ifdef CONFIG_PM_SLEEP
@@ -1967,7 +1832,7 @@ MODULE_DEVICE_TABLE(acpi, ideapad_device_ids);
 
 static struct platform_driver ideapad_acpi_driver = {
        .probe = ideapad_acpi_add,
-       .remove = ideapad_acpi_remove,
+       .remove_new = ideapad_acpi_remove,
        .driver = {
                .name   = "ideapad_acpi",
                .pm     = &ideapad_pm,