23 files changed, 371 insertions, 147 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index e631dbeafd79..7bec4588c268 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -385,6 +385,16 @@ config EEEPC_LAPTOP
          If you have an Eee PC laptop, say Y or M here.
+config EEEPC_WMI
+        tristate "Eee PC WMI Hotkey Driver (EXPERIMENTAL)"
+        depends on ACPI_WMI
+        depends on INPUT
+        depends on EXPERIMENTAL
+        ---help---
+          Say Y here if you want to support WMI-based hotkeys on Eee PC laptops.
+          To compile this driver as a module, choose M here: the module will
+          be called eeepc-wmi.
 config ACPI_WMI
        tristate "WMI"
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 9cd9fa0a27e6..a906490e3530 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -4,6 +4,7 @@
 #
 obj-$(CONFIG_ASUS_LAPTOP)       += asus-laptop.o
 obj-$(CONFIG_EEEPC_LAPTOP)      += eeepc-laptop.o
+obj-$(CONFIG_EEEPC_WMI)         += eeepc-wmi.o
 obj-$(CONFIG_MSI_LAPTOP)        += msi-laptop.o
 obj-$(CONFIG_ACPI_CMPC)         += classmate-laptop.o
 obj-$(CONFIG_COMPAL_LAPTOP)     += compal-laptop.o
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 226b3e93498c..1ea6c434d330 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -36,6 +36,7 @@
 #include <linux/rfkill.h>
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
+#include <linux/slab.h>
 #include <acpi/acpi_drivers.h>
@@ -922,9 +923,13 @@ static struct backlight_ops acer_bl_ops = {
 static int __devinit acer_backlight_init(struct device *dev)
 {
+        struct backlight_properties props;
        struct backlight_device *bd;
-        bd = backlight_device_register("acer-wmi", dev, NULL, &acer_bl_ops);
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = max_brightness;
+        bd = backlight_device_register("acer-wmi", dev, NULL, &acer_bl_ops,
+                                       &props);
        if (IS_ERR(bd)) {
                printk(ACER_ERR "Could not register Acer backlight device\n");
                acer_backlight_device = NULL;
@@ -935,7 +940,6 @@ static int __devinit acer_backlight_init(struct device *dev)
        bd->props.power = FB_BLANK_UNBLANK;
        bd->props.brightness = read_brightness(bd);
-        bd->props.max_brightness = max_brightness;
        backlight_update_status(bd);
        return 0;
 }
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 791fcf321506..52262b012abb 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -49,6 +49,7 @@
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
 #include <linux/rfkill.h>
+#include <linux/slab.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
@@ -139,7 +140,7 @@ MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot "
 /* Backlight */
 static acpi_handle lcd_switch_handle;
-static const char *lcd_switch_paths[] = {
+static char *lcd_switch_paths[] = {
  "\\_SB.PCI0.SBRG.EC0._Q10",   /* All new models */
  "\\_SB.PCI0.ISA.EC0._Q10",    /* A1x */
  "\\_SB.PCI0.PX40.ECD0._Q10",  /* L3C */
@@ -153,7 +154,7 @@ static const char *lcd_switch_paths[] = {
 #define METHOD_SWITCH_DISPLAY   "SDSP"
 static acpi_handle display_get_handle;
-static const char *display_get_paths[] = {
+static char *display_get_paths[] = {
  /* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */
  "\\_SB.PCI0.P0P1.VGA.GETD",
  /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V G1 */
@@ -639,12 +640,16 @@ static int asus_backlight_init(struct asus_laptop *asus)
 {
        struct backlight_device *bd;
        struct device *dev = &asus->platform_device->dev;
+        struct backlight_properties props;
        if (!acpi_check_handle(asus->handle, METHOD_BRIGHTNESS_GET, NULL) &&
            !acpi_check_handle(asus->handle, METHOD_BRIGHTNESS_SET, NULL) &&
            lcd_switch_handle) {
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = 15;
                bd = backlight_device_register(ASUS_LAPTOP_FILE, dev,
-                                               asus, &asusbl_ops);
+                                               asus, &asusbl_ops, &props);
                if (IS_ERR(bd)) {
                        pr_err("Could not register asus backlight device\n");
                        asus->backlight_device = NULL;
@@ -653,7 +658,6 @@ static int asus_backlight_init(struct asus_laptop *asus)
                asus->backlight_device = bd;
-                bd->props.max_brightness = 15;
                bd->props.power = FB_BLANK_UNBLANK;
                bd->props.brightness = asus_read_brightness(bd);
                backlight_update_status(bd);
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
index 1381430e1105..92fd30c9379c 100644
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
@@ -32,6 +32,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/proc_fs.h>
@@ -1481,6 +1482,7 @@ static void asus_acpi_exit(void)
 static int __init asus_acpi_init(void)
 {
+        struct backlight_properties props;
        int result;
        result = acpi_bus_register_driver(&asus_hotk_driver);
@@ -1507,15 +1509,17 @@ static int __init asus_acpi_init(void)
                return -ENODEV;
        }
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 15;
        asus_backlight_device = backlight_device_register("asus", NULL, NULL,
-                                                          &asus_backlight_data);
+                                                          &asus_backlight_data,
+                                                          &props);
        if (IS_ERR(asus_backlight_device)) {
                printk(KERN_ERR "Could not register asus backlight device\n");
                asus_backlight_device = NULL;
                asus_acpi_exit();
                return -ENODEV;
        }
-        asus_backlight_device->props.max_brightness = 15;
        return 0;
 }
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c
index 035a7dd65a3f..7f9e5ddc9498 100644
--- a/drivers/platform/x86/classmate-laptop.c
+++ b/drivers/platform/x86/classmate-laptop.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/backlight.h>
@@ -455,18 +456,22 @@ static int cmpc_bl_update_status(struct backlight_device *bd)
                return -1;
 }
-static struct backlight_ops cmpc_bl_ops = {
+static const struct backlight_ops cmpc_bl_ops = {
        .get_brightness = cmpc_bl_get_brightness,
        .update_status = cmpc_bl_update_status
 };
 static int cmpc_bl_add(struct acpi_device *acpi)
 {
+        struct backlight_properties props;
        struct backlight_device *bd;
-        bd = backlight_device_register("cmpc_bl", &acpi->dev,
+        memset(&props, 0, sizeof(struct backlight_properties));
-                                       acpi->handle, &cmpc_bl_ops);
+        props.max_brightness = 7;
-        bd->props.max_brightness = 7;
+        bd = backlight_device_register("cmpc_bl", &acpi->dev, acpi->handle,
+                                       &cmpc_bl_ops, &props);
+        if (IS_ERR(bd))
+                return PTR_ERR(bd);
        dev_set_drvdata(&acpi->dev, bd);
        return 0;
 }
diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
index 2740b40aad9b..71ff1545a93e 100644
--- a/drivers/platform/x86/compal-laptop.c
+++ b/drivers/platform/x86/compal-laptop.c
@@ -291,12 +291,15 @@ static int __init compal_init(void)
        /* Register backlight stuff */
        if (!acpi_video_backlight_support()) {
-                compalbl_device = backlight_device_register("compal-laptop", NULL, NULL,
+                struct backlight_properties props;
-                                                            &compalbl_ops);
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = COMPAL_LCD_LEVEL_MAX - 1;
+                compalbl_device = backlight_device_register("compal-laptop",
+                                                            NULL, NULL,
+                                                            &compalbl_ops,
+                                                            &props);
                if (IS_ERR(compalbl_device))
                        return PTR_ERR(compalbl_device);
-                compalbl_device->props.max_brightness = COMPAL_LCD_LEVEL_MAX-1;
        }
        ret = platform_driver_register(&compal_driver);
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index ef614979afe9..661e3ac4d5b1 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -24,6 +24,7 @@
 #include <linux/acpi.h>
 #include <linux/mm.h>
 #include <linux/i8042.h>
+#include <linux/slab.h>
 #include "../../firmware/dcdbas.h"
 #define BRIGHTNESS_TOKEN 0x7d
@@ -559,10 +560,14 @@ static int __init dell_init(void)
        release_buffer();
        if (max_intensity) {
-                dell_backlight_device = backlight_device_register(
+                struct backlight_properties props;
-                        "dell_backlight",
+                memset(&props, 0, sizeof(struct backlight_properties));
-                        &platform_device->dev, NULL,
+                props.max_brightness = max_intensity;
-                        &dell_ops);
+                dell_backlight_device = backlight_device_register("dell_backlight",
+                                                                  &platform_device->dev,
+                                                                  NULL,
+                                                                  &dell_ops,
+                                                                  &props);
                if (IS_ERR(dell_backlight_device)) {
                        ret = PTR_ERR(dell_backlight_device);
@@ -570,7 +575,6 @@ static int __init dell_init(void)
                        goto fail_backlight;
                }
-                dell_backlight_device->props.max_brightness = max_intensity;
                dell_backlight_device->props.brightness =
                        dell_get_intensity(dell_backlight_device);
                backlight_update_status(dell_backlight_device);
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index 1b1dddbd5744..6ba6c30e5bb6 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/input.h>
 #include <acpi/acpi_drivers.h>
@@ -142,7 +143,7 @@ static struct key_entry *dell_wmi_keymap = dell_legacy_wmi_keymap;
 static struct input_dev *dell_wmi_input_dev;
-static struct key_entry *dell_wmi_get_entry_by_scancode(int code)
+static struct key_entry *dell_wmi_get_entry_by_scancode(unsigned int code)
 {
        struct key_entry *key;
@@ -153,7 +154,7 @@ static struct key_entry *dell_wmi_get_entry_by_scancode(int code)
        return NULL;
 }
-static struct key_entry *dell_wmi_get_entry_by_keycode(int keycode)
+static struct key_entry *dell_wmi_get_entry_by_keycode(unsigned int keycode)
 {
        struct key_entry *key;
@@ -164,8 +165,8 @@ static struct key_entry *dell_wmi_get_entry_by_keycode(int keycode)
        return NULL;
 }
-static int dell_wmi_getkeycode(struct input_dev *dev, int scancode,
+static int dell_wmi_getkeycode(struct input_dev *dev,
-                               int *keycode)
+                                unsigned int scancode, unsigned int *keycode)
 {
        struct key_entry *key = dell_wmi_get_entry_by_scancode(scancode);
@@ -177,13 +178,11 @@ static int dell_wmi_getkeycode(struct input_dev *dev, int scancode,
        return -EINVAL;
 }
-static int dell_wmi_setkeycode(struct input_dev *dev, int scancode, int keycode)
+static int dell_wmi_setkeycode(struct input_dev *dev,
+                                unsigned int scancode, unsigned int keycode)
 {
        struct key_entry *key;
-        int old_keycode;
+        unsigned int old_keycode;
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
        key = dell_wmi_get_entry_by_scancode(scancode);
        if (key && key->type == KE_KEY) {
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 9a844caa3756..54a015785ca8 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -27,6 +27,7 @@
 #include <linux/fb.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
+#include <linux/slab.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <linux/uaccess.h>
@@ -1131,18 +1132,20 @@ static int eeepc_backlight_notify(struct eeepc_laptop *eeepc)
 static int eeepc_backlight_init(struct eeepc_laptop *eeepc)
 {
+        struct backlight_properties props;
        struct backlight_device *bd;
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = 15;
        bd = backlight_device_register(EEEPC_LAPTOP_FILE,
-                                       &eeepc->platform_device->dev,
+                                       &eeepc->platform_device->dev, eeepc,
-                                       eeepc, &eeepcbl_ops);
+                                       &eeepcbl_ops, &props);
        if (IS_ERR(bd)) {
                pr_err("Could not register eeepc backlight device\n");
                eeepc->backlight_device = NULL;
                return PTR_ERR(bd);
        }
        eeepc->backlight_device = bd;
-        bd->props.max_brightness = 15;
        bd->props.brightness = read_brightness(bd);
        bd->props.power = FB_BLANK_UNBLANK;
        backlight_update_status(bd);
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
new file mode 100644
index 000000000000..9f8822658fd7
--- /dev/null
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -0,0 +1,158 @@
+/*
+ * Eee PC WMI hotkey driver
+ *
+ * Copyright(C) 2010 Intel Corporation.
+ *
+ * Portions based on wistron_btns.c:
+ * Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz>
+ * Copyright (C) 2005 Bernhard Rosenkraenzer <bero@arklinux.org>
+ * Copyright (C) 2005 Dmitry Torokhov <dtor@mail.ru>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
+#include <acpi/acpi_bus.h>
+#include <acpi/acpi_drivers.h>
+MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>");
+MODULE_DESCRIPTION("Eee PC WMI Hotkey Driver");
+MODULE_LICENSE("GPL");
+#define EEEPC_WMI_EVENT_GUID    "ABBC0F72-8EA1-11D1-00A0-C90629100000"
+MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID);
+#define NOTIFY_BRNUP_MIN        0x11
+#define NOTIFY_BRNUP_MAX        0x1f
+#define NOTIFY_BRNDOWN_MIN      0x20
+#define NOTIFY_BRNDOWN_MAX      0x2e
+static const struct key_entry eeepc_wmi_keymap[] = {
+        /* Sleep already handled via generic ACPI code */
+        { KE_KEY, 0x5d, { KEY_WLAN } },
+        { KE_KEY, 0x32, { KEY_MUTE } },
+        { KE_KEY, 0x31, { KEY_VOLUMEDOWN } },
+        { KE_KEY, 0x30, { KEY_VOLUMEUP } },
+        { KE_IGNORE, NOTIFY_BRNDOWN_MIN, { KEY_BRIGHTNESSDOWN } },
+        { KE_IGNORE, NOTIFY_BRNUP_MIN, { KEY_BRIGHTNESSUP } },
+        { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } },
+        { KE_END, 0},
+};
+static struct input_dev *eeepc_wmi_input_dev;
+static void eeepc_wmi_notify(u32 value, void *context)
+{
+        struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
+        acpi_status status;
+        int code;
+        status = wmi_get_event_data(value, &response);
+        if (status != AE_OK) {
+                pr_err("EEEPC WMI: bad event status 0x%x\n", status);
+                return;
+        }
+        obj = (union acpi_object *)response.pointer;
+        if (obj && obj->type == ACPI_TYPE_INTEGER) {
+                code = obj->integer.value;
+                if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
+                        code = NOTIFY_BRNUP_MIN;
+                else if (code >= NOTIFY_BRNDOWN_MIN && code <= NOTIFY_BRNDOWN_MAX)
+                        code = NOTIFY_BRNDOWN_MIN;
+                if (!sparse_keymap_report_event(eeepc_wmi_input_dev,
+                                                code, 1, true))
+                        pr_info("EEEPC WMI: Unknown key %x pressed\n", code);
+        }
+        kfree(obj);
+}
+static int eeepc_wmi_input_setup(void)
+{
+        int err;
+        eeepc_wmi_input_dev = input_allocate_device();
+        if (!eeepc_wmi_input_dev)
+                return -ENOMEM;
+        eeepc_wmi_input_dev->name = "Eee PC WMI hotkeys";
+        eeepc_wmi_input_dev->phys = "wmi/input0";
+        eeepc_wmi_input_dev->id.bustype = BUS_HOST;
+        err = sparse_keymap_setup(eeepc_wmi_input_dev, eeepc_wmi_keymap, NULL);
+        if (err)
+                goto err_free_dev;
+        err = input_register_device(eeepc_wmi_input_dev);
+        if (err)
+                goto err_free_keymap;
+        return 0;
+err_free_keymap:
+        sparse_keymap_free(eeepc_wmi_input_dev);
+err_free_dev:
+        input_free_device(eeepc_wmi_input_dev);
+        return err;
+}
+static int __init eeepc_wmi_init(void)
+{
+        int err;
+        acpi_status status;
+        if (!wmi_has_guid(EEEPC_WMI_EVENT_GUID)) {
+                pr_warning("EEEPC WMI: No known WMI GUID found\n");
+                return -ENODEV;
+        }
+        err = eeepc_wmi_input_setup();
+        if (err)
+                return err;
+        status = wmi_install_notify_handler(EEEPC_WMI_EVENT_GUID,
+                                        eeepc_wmi_notify, NULL);
+        if (ACPI_FAILURE(status)) {
+                sparse_keymap_free(eeepc_wmi_input_dev);
+                input_unregister_device(eeepc_wmi_input_dev);
+                pr_err("EEEPC WMI: Unable to register notify handler - %d\n",
+                        status);
+                return -ENODEV;
+        }
+        return 0;
+}
+static void __exit eeepc_wmi_exit(void)
+{
+        wmi_remove_notify_handler(EEEPC_WMI_EVENT_GUID);
+        sparse_keymap_free(eeepc_wmi_input_dev);
+        input_unregister_device(eeepc_wmi_input_dev);
+}
+module_init(eeepc_wmi_init);
+module_exit(eeepc_wmi_exit);
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 5f3320d468f6..47b4fd75aa34 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -66,6 +66,7 @@
 #include <linux/kfifo.h>
 #include <linux/video_output.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)
 #include <linux/leds.h>
 #endif
@@ -1126,16 +1127,20 @@ static int __init fujitsu_init(void)
        /* Register backlight stuff */
        if (!acpi_video_backlight_support()) {
-                fujitsu->bl_device =
+                struct backlight_properties props;
-                        backlight_device_register("fujitsu-laptop", NULL, NULL,
-                                                  &fujitsubl_ops);
+                memset(&props, 0, sizeof(struct backlight_properties));
+                max_brightness = fujitsu->max_brightness;
+                props.max_brightness = max_brightness - 1;
+                fujitsu->bl_device = backlight_device_register("fujitsu-laptop",
+                                                               NULL, NULL,
+                                                               &fujitsubl_ops,
+                                                               &props);
                if (IS_ERR(fujitsu->bl_device)) {
                        ret = PTR_ERR(fujitsu->bl_device);
                        fujitsu->bl_device = NULL;
                        goto fail_sysfs_group;
                }
-                max_brightness = fujitsu->max_brightness;
-                fujitsu->bl_device->props.max_brightness = max_brightness - 1;
                fujitsu->bl_device->props.brightness = fujitsu->brightness_level;
        }
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 7ccf33c08967..51c07a05a7bc 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/input.h>
 #include <acpi/acpi_drivers.h>
@@ -278,7 +279,7 @@ static DEVICE_ATTR(als, S_IRUGO | S_IWUSR, show_als, set_als);
 static DEVICE_ATTR(dock, S_IRUGO, show_dock, NULL);
 static DEVICE_ATTR(tablet, S_IRUGO, show_tablet, NULL);
-static struct key_entry *hp_wmi_get_entry_by_scancode(int code)
+static struct key_entry *hp_wmi_get_entry_by_scancode(unsigned int code)
 {
        struct key_entry *key;
@@ -289,7 +290,7 @@ static struct key_entry *hp_wmi_get_entry_by_scancode(int code)
        return NULL;
 }
-static struct key_entry *hp_wmi_get_entry_by_keycode(int keycode)
+static struct key_entry *hp_wmi_get_entry_by_keycode(unsigned int keycode)
 {
        struct key_entry *key;
@@ -300,7 +301,8 @@ static struct key_entry *hp_wmi_get_entry_by_keycode(int keycode)
        return NULL;
 }
-static int hp_wmi_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+static int hp_wmi_getkeycode(struct input_dev *dev,
+                             unsigned int scancode, unsigned int *keycode)
 {
        struct key_entry *key = hp_wmi_get_entry_by_scancode(scancode);
@@ -312,13 +314,11 @@ static int hp_wmi_getkeycode(struct input_dev *dev, int scancode, int *keycode)
        return -EINVAL;
 }
-static int hp_wmi_setkeycode(struct input_dev *dev, int scancode, int keycode)
+static int hp_wmi_setkeycode(struct input_dev *dev,
+                             unsigned int scancode, unsigned int keycode)
 {
        struct key_entry *key;
-        int old_keycode;
+        unsigned int old_keycode;
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
        key = hp_wmi_get_entry_by_scancode(scancode);
        if (key && key->type == KE_KEY) {
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index f0a90a6bf396..2f795ce2b939 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
@@ -30,6 +30,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/pm.h>
@@ -396,6 +397,7 @@ static int intel_menlow_add_one_attribute(char *name, int mode, void *show,
        if (!attr)
                return -ENOMEM;
+        sysfs_attr_init(&attr->attr.attr); /* That is consistent naming :D */
        attr->attr.attr.name = name;
        attr->attr.attr.mode = mode;
        attr->attr.show = show;
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
index c2b05da4289a..996223a7c009 100644
--- a/drivers/platform/x86/msi-laptop.c
+++ b/drivers/platform/x86/msi-laptop.c
@@ -683,11 +683,14 @@ static int __init msi_init(void)
                printk(KERN_INFO "MSI: Brightness ignored, must be controlled "
                       "by ACPI video driver\n");
        } else {
+                struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = MSI_LCD_LEVEL_MAX - 1;
                msibl_device = backlight_device_register("msi-laptop-bl", NULL,
-                                                         NULL, &msibl_ops);
+                                                         NULL, &msibl_ops,
+                                                         &props);
                if (IS_ERR(msibl_device))
                        return PTR_ERR(msibl_device);
-                msibl_device->props.max_brightness = MSI_LCD_LEVEL_MAX-1;
        }
        ret = platform_driver_register(&msipf_driver);
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index f5f70d4c6913..d1736009636f 100644
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -26,6 +26,7 @@
 #include <linux/input/sparse-keymap.h>
 #include <linux/acpi.h>
 #include <linux/backlight.h>
+#include <linux/slab.h>
 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
 MODULE_DESCRIPTION("MSI laptop WMI hotkeys driver");
@@ -138,7 +139,7 @@ static int bl_set_status(struct backlight_device *bd)
        return msi_wmi_set_block(0, backlight_map[bright]);
 }
-static struct backlight_ops msi_backlight_ops = {
+static const struct backlight_ops msi_backlight_ops = {
        .get_brightness = bl_get,
        .update_status  = bl_set_status,
 };
@@ -249,12 +250,17 @@ static int __init msi_wmi_init(void)
                goto err_uninstall_notifier;
        if (!acpi_video_backlight_support()) {
-                backlight = backlight_device_register(DRV_NAME,
+                struct backlight_properties props;
-                                NULL, NULL, &msi_backlight_ops);
+                memset(&props, 0, sizeof(struct backlight_properties));
-                if (IS_ERR(backlight))
+                props.max_brightness = ARRAY_SIZE(backlight_map) - 1;
+                backlight = backlight_device_register(DRV_NAME, NULL, NULL,
+                                                      &msi_backlight_ops,
+                                                      &props);
+                if (IS_ERR(backlight)) {
+                        err = PTR_ERR(backlight);
                        goto err_free_input;
+                }
-                backlight->props.max_brightness = ARRAY_SIZE(backlight_map) - 1;
                err = bl_get(NULL);
                if (err < 0)
                        goto err_free_backlight;
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
index fe7cf0188acc..2fb9a32926f8 100644
--- a/drivers/platform/x86/panasonic-laptop.c
+++ b/drivers/platform/x86/panasonic-laptop.c
@@ -124,6 +124,7 @@
 #include <linux/ctype.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
+#include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>
 #include <linux/input.h>
@@ -200,7 +201,7 @@ static struct acpi_driver acpi_pcc_driver = {
 };
 #define KEYMAP_SIZE             11
-static const int initial_keymap[KEYMAP_SIZE] = {
+static const unsigned int initial_keymap[KEYMAP_SIZE] = {
        /*  0 */ KEY_RESERVED,
        /*  1 */ KEY_BRIGHTNESSDOWN,
        /*  2 */ KEY_BRIGHTNESSUP,
@@ -222,7 +223,7 @@ struct pcc_acpi {
        struct acpi_device      *device;
        struct input_dev        *input_dev;
        struct backlight_device *backlight;
-        int                     keymap[KEYMAP_SIZE];
+        unsigned int            keymap[KEYMAP_SIZE];
 };
 struct pcc_keyinput {
@@ -352,7 +353,7 @@ static int bl_set_status(struct backlight_device *bd)
        return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
 }
-static struct backlight_ops pcc_backlight_ops = {
+static const struct backlight_ops pcc_backlight_ops = {
        .get_brightness = bl_get,
        .update_status  = bl_set_status,
 };
@@ -445,7 +446,8 @@ static struct attribute_group pcc_attr_group = {
 /* hotkey input device driver */
-static int pcc_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+static int pcc_getkeycode(struct input_dev *dev,
+                          unsigned int scancode, unsigned int *keycode)
 {
        struct pcc_acpi *pcc = input_get_drvdata(dev);
@@ -457,7 +459,7 @@ static int pcc_getkeycode(struct input_dev *dev, int scancode, int *keycode)
        return 0;
 }
-static int keymap_get_by_keycode(struct pcc_acpi *pcc, int keycode)
+static int keymap_get_by_keycode(struct pcc_acpi *pcc, unsigned int keycode)
 {
        int i;
@@ -469,7 +471,8 @@ static int keymap_get_by_keycode(struct pcc_acpi *pcc, int keycode)
        return 0;
 }
-static int pcc_setkeycode(struct input_dev *dev, int scancode, int keycode)
+static int pcc_setkeycode(struct input_dev *dev,
+                          unsigned int scancode, unsigned int keycode)
 {
        struct pcc_acpi *pcc = input_get_drvdata(dev);
        int oldkeycode;
@@ -477,9 +480,6 @@ static int pcc_setkeycode(struct input_dev *dev, int scancode, int keycode)
        if (scancode >= ARRAY_SIZE(pcc->keymap))
                return -EINVAL;
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
        oldkeycode = pcc->keymap[scancode];
        pcc->keymap[scancode] = keycode;
@@ -601,6 +601,7 @@ static int acpi_pcc_hotkey_resume(struct acpi_device *device)
 static int acpi_pcc_hotkey_add(struct acpi_device *device)
 {
+        struct backlight_properties props;
        struct pcc_acpi *pcc;
        int num_sifr, result;
@@ -638,24 +639,25 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
        if (result) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                  "Error installing keyinput handler\n"));
-                goto out_sinf;
+                goto out_hotkey;
        }
-        /* initialize backlight */
-        pcc->backlight = backlight_device_register("panasonic", NULL, pcc,
-                                                   &pcc_backlight_ops);
-        if (IS_ERR(pcc->backlight))
-                goto out_input;
        if (!acpi_pcc_retrieve_biosdata(pcc, pcc->sinf)) {
                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                 "Couldn't retrieve BIOS data\n"));
-                goto out_backlight;
+                goto out_input;
+        }
+        /* initialize backlight */
+        memset(&props, 0, sizeof(struct backlight_properties));
+        props.max_brightness = pcc->sinf[SINF_AC_MAX_BRIGHT];
+        pcc->backlight = backlight_device_register("panasonic", NULL, pcc,
+                                                   &pcc_backlight_ops, &props);
+        if (IS_ERR(pcc->backlight)) {
+                result = PTR_ERR(pcc->backlight);
+                goto out_sinf;
        }
        /* read the initial brightness setting from the hardware */
-        pcc->backlight->props.max_brightness =
-                                        pcc->sinf[SINF_AC_MAX_BRIGHT];
        pcc->backlight->props.brightness = pcc->sinf[SINF_AC_CUR_BRIGHT];
        /* read the initial sticky key mode from the hardware */
@@ -670,12 +672,12 @@ static int acpi_pcc_hotkey_add(struct acpi_device *device)
 out_backlight:
        backlight_device_unregister(pcc->backlight);
+out_sinf:
+        kfree(pcc->sinf);
 out_input:
        input_unregister_device(pcc->input_dev);
        /* no need to input_free_device() since core input API refcount and
         * free()s the device */
-out_sinf:
-        kfree(pcc->sinf);
 out_hotkey:
        kfree(pcc);
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 3f71a605a492..1387c5f9c24d 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -58,6 +58,7 @@
 #include <linux/kfifo.h>
 #include <linux/workqueue.h>
 #include <linux/acpi.h>
+#include <linux/slab.h>
 #include <acpi/acpi_drivers.h>
 #include <acpi/acpi_bus.h>
 #include <asm/uaccess.h>
@@ -145,7 +146,7 @@ struct sony_laptop_input_s {
        struct input_dev        *key_dev;
        struct kfifo            fifo;
        spinlock_t              fifo_lock;
-        struct workqueue_struct *wq;
+        struct timer_list       release_key_timer;
 };
 static struct sony_laptop_input_s sony_laptop_input = {
@@ -299,20 +300,26 @@ static int sony_laptop_input_keycode_map[] = {
 };
 /* release buttons after a short delay if pressed */
-static void do_sony_laptop_release_key(struct work_struct *work)
+static void do_sony_laptop_release_key(unsigned long unused)
 {
        struct sony_laptop_keypress kp;
+        unsigned long flags;
+        spin_lock_irqsave(&sony_laptop_input.fifo_lock, flags);
-        while (kfifo_out_locked(&sony_laptop_input.fifo, (unsigned char *)&kp,
+        if (kfifo_out(&sony_laptop_input.fifo,
-                        sizeof(kp), &sony_laptop_input.fifo_lock)
+                      (unsigned char *)&kp, sizeof(kp)) == sizeof(kp)) {
-                        == sizeof(kp)) {
-                msleep(10);
                input_report_key(kp.dev, kp.key, 0);
                input_sync(kp.dev);
        }
+        /* If there is something in the fifo schedule next release. */
+        if (kfifo_len(&sony_laptop_input.fifo) != 0)
+                mod_timer(&sony_laptop_input.release_key_timer,
+                          jiffies + msecs_to_jiffies(10));
+        spin_unlock_irqrestore(&sony_laptop_input.fifo_lock, flags);
 }
-static DECLARE_WORK(sony_laptop_release_key_work,
-                do_sony_laptop_release_key);
 /* forward event to the input subsystem */
 static void sony_laptop_report_input_event(u8 event)
@@ -366,13 +373,13 @@ static void sony_laptop_report_input_event(u8 event)
                /* we emit the scancode so we can always remap the key */
                input_event(kp.dev, EV_MSC, MSC_SCAN, event);
                input_sync(kp.dev);
-                kfifo_in_locked(&sony_laptop_input.fifo,
-                          (unsigned char *)&kp, sizeof(kp),
-                          &sony_laptop_input.fifo_lock);
-                if (!work_pending(&sony_laptop_release_key_work))
+                /* schedule key release */
-                        queue_work(sony_laptop_input.wq,
+                kfifo_in_locked(&sony_laptop_input.fifo,
-                                        &sony_laptop_release_key_work);
+                                (unsigned char *)&kp, sizeof(kp),
+                                &sony_laptop_input.fifo_lock);
+                mod_timer(&sony_laptop_input.release_key_timer,
+                          jiffies + msecs_to_jiffies(10));
        } else
                dprintk("unknown input event %.2x\n", event);
 }
@@ -390,27 +397,21 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device)
        /* kfifo */
        spin_lock_init(&sony_laptop_input.fifo_lock);
-        error =
+        error = kfifo_alloc(&sony_laptop_input.fifo,
-         kfifo_alloc(&sony_laptop_input.fifo, SONY_LAPTOP_BUF_SIZE, GFP_KERNEL);
+                            SONY_LAPTOP_BUF_SIZE, GFP_KERNEL);
        if (error) {
                printk(KERN_ERR DRV_PFX "kfifo_alloc failed\n");
                goto err_dec_users;
        }
-        /* init workqueue */
+        setup_timer(&sony_laptop_input.release_key_timer,
-        sony_laptop_input.wq = create_singlethread_workqueue("sony-laptop");
+                    do_sony_laptop_release_key, 0);
-        if (!sony_laptop_input.wq) {
-                printk(KERN_ERR DRV_PFX
-                                "Unable to create workqueue.\n");
-                error = -ENXIO;
-                goto err_free_kfifo;
-        }
        /* input keys */
        key_dev = input_allocate_device();
        if (!key_dev) {
                error = -ENOMEM;
-                goto err_destroy_wq;
+                goto err_free_kfifo;
        }
        key_dev->name = "Sony Vaio Keys";
@@ -419,18 +420,15 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device)
        key_dev->dev.parent = &acpi_device->dev;
        /* Initialize the Input Drivers: special keys */
-        set_bit(EV_KEY, key_dev->evbit);
+        input_set_capability(key_dev, EV_MSC, MSC_SCAN);
-        set_bit(EV_MSC, key_dev->evbit);
-        set_bit(MSC_SCAN, key_dev->mscbit);
+        __set_bit(EV_KEY, key_dev->evbit);
        key_dev->keycodesize = sizeof(sony_laptop_input_keycode_map[0]);
        key_dev->keycodemax = ARRAY_SIZE(sony_laptop_input_keycode_map);
        key_dev->keycode = &sony_laptop_input_keycode_map;
-        for (i = 0; i < ARRAY_SIZE(sony_laptop_input_keycode_map); i++) {
+        for (i = 0; i < ARRAY_SIZE(sony_laptop_input_keycode_map); i++)
-                if (sony_laptop_input_keycode_map[i] != KEY_RESERVED) {
+                __set_bit(sony_laptop_input_keycode_map[i], key_dev->keybit);
-                        set_bit(sony_laptop_input_keycode_map[i],
+        __clear_bit(KEY_RESERVED, key_dev->keybit);
-                                key_dev->keybit);
-                }
-        }
        error = input_register_device(key_dev);
        if (error)
@@ -450,9 +448,8 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device)
        jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
        key_dev->dev.parent = &acpi_device->dev;
-        jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
+        input_set_capability(jog_dev, EV_KEY, BTN_MIDDLE);
-        jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);
+        input_set_capability(jog_dev, EV_REL, REL_WHEEL);
-        jog_dev->relbit[0] = BIT_MASK(REL_WHEEL);
        error = input_register_device(jog_dev);
        if (error)
@@ -473,9 +470,6 @@ err_unregister_keydev:
 err_free_keydev:
        input_free_device(key_dev);
-err_destroy_wq:
-        destroy_workqueue(sony_laptop_input.wq);
 err_free_kfifo:
        kfifo_free(&sony_laptop_input.fifo);
@@ -486,12 +480,23 @@ err_dec_users:
 static void sony_laptop_remove_input(void)
 {
-        /* cleanup only after the last user has gone */
+        struct sony_laptop_keypress kp = { NULL };
+        /* Cleanup only after the last user has gone */
        if (!atomic_dec_and_test(&sony_laptop_input.users))
                return;
-        /* flush workqueue first */
+        del_timer_sync(&sony_laptop_input.release_key_timer);
-        flush_workqueue(sony_laptop_input.wq);
+        /*
+         * Generate key-up events for remaining keys. Note that we don't
+         * need locking since nobody is adding new events to the kfifo.
+         */
+        while (kfifo_out(&sony_laptop_input.fifo,
+                         (unsigned char *)&kp, sizeof(kp)) == sizeof(kp)) {
+                input_report_key(kp.dev, kp.key, 0);
+                input_sync(kp.dev);
+        }
        /* destroy input devs */
        input_unregister_device(sony_laptop_input.key_dev);
@@ -502,7 +507,6 @@ static void sony_laptop_remove_input(void)
                sony_laptop_input.jog_dev = NULL;
        }
-        destroy_workqueue(sony_laptop_input.wq);
        kfifo_free(&sony_laptop_input.fifo);
 }
@@ -1288,9 +1292,13 @@ static int sony_nc_add(struct acpi_device *device)
                       "controlled by ACPI video driver\n");
        } else if (ACPI_SUCCESS(acpi_get_handle(sony_nc_acpi_handle, "GBRT",
                                                &handle))) {
+                                                        struct backlight_properties props;
+                memset(&props, 0, sizeof(struct backlight_properties));
+                props.max_brightness = SONY_MAX_BRIGHTNESS - 1;
                sony_backlight_device = backlight_device_register("sony", NULL,
                                                                  NULL,
-                                                                  &sony_backlight_ops);
+                                                                  &sony_backlight_ops,
+                                                                  &props);
                if (IS_ERR(sony_backlight_device)) {
                        printk(KERN_WARNING DRV_PFX "unable to register backlight device\n");
@@ -1299,8 +1307,6 @@ static int sony_nc_add(struct acpi_device *device)
                        sony_backlight_device->props.brightness =
                            sony_backlight_get_brightness
                            (sony_backlight_device);
-                        sony_backlight_device->props.max_brightness =
-                            SONY_MAX_BRIGHTNESS - 1;
                }
        }
diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
index dd33b51c3486..1fe0f1feff71 100644
--- a/drivers/platform/x86/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
@@ -27,6 +27,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <acpi/acpi.h>
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index c64e3528889b..63290b33c879 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -58,6 +58,7 @@
 #include <linux/kthread.h>
 #include <linux/freezer.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/nvram.h>
 #include <linux/proc_fs.h>
@@ -6170,6 +6171,7 @@ static const struct tpacpi_quirk brightness_quirk_table[] __initconst = {
 static int __init brightness_init(struct ibm_init_struct *iibm)
 {
+        struct backlight_properties props;
        int b;
        unsigned long quirks;
@@ -6259,9 +6261,12 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                printk(TPACPI_INFO
                       "detected a 16-level brightness capable ThinkPad\n");
-        ibm_backlight_device = backlight_device_register(
+        memset(&props, 0, sizeof(struct backlight_properties));
-                                        TPACPI_BACKLIGHT_DEV_NAME, NULL, NULL,
+        props.max_brightness = (tp_features.bright_16levels) ? 15 : 7;
-                                        &ibm_backlight_data);
+        ibm_backlight_device = backlight_device_register(TPACPI_BACKLIGHT_DEV_NAME,
+                                                         NULL, NULL,
+                                                         &ibm_backlight_data,
+                                                         &props);
        if (IS_ERR(ibm_backlight_device)) {
                int rc = PTR_ERR(ibm_backlight_device);
                ibm_backlight_device = NULL;
@@ -6280,8 +6285,6 @@ static int __init brightness_init(struct ibm_init_struct *iibm)
                        "or not on your ThinkPad\n", TPACPI_MAIL);
        }
-        ibm_backlight_device->props.max_brightness =
-                                (tp_features.bright_16levels)? 15 : 7;
        ibm_backlight_device->props.brightness = b & TP_EC_BACKLIGHT_LVLMSK;
        backlight_update_status(ibm_backlight_device);
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c
index 02f3d4e9e666..ff4b476f1950 100644
--- a/drivers/platform/x86/topstar-laptop.c
+++ b/drivers/platform/x86/topstar-laptop.c
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/acpi.h>
 #include <linux/input.h>
@@ -46,7 +47,7 @@ static struct tps_key_entry topstar_keymap[] = {
        { }
 };
-static struct tps_key_entry *tps_get_key_by_scancode(int code)
+static struct tps_key_entry *tps_get_key_by_scancode(unsigned int code)
 {
        struct tps_key_entry *key;
@@ -57,7 +58,7 @@ static struct tps_key_entry *tps_get_key_by_scancode(int code)
        return NULL;
 }
-static struct tps_key_entry *tps_get_key_by_keycode(int code)
+static struct tps_key_entry *tps_get_key_by_keycode(unsigned int code)
 {
        struct tps_key_entry *key;
@@ -126,7 +127,8 @@ static int acpi_topstar_fncx_switch(struct acpi_device *device, bool state)
        return 0;
 }
-static int topstar_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+static int topstar_getkeycode(struct input_dev *dev,
+                                unsigned int scancode, unsigned int *keycode)
 {
        struct tps_key_entry *key = tps_get_key_by_scancode(scancode);
@@ -137,14 +139,12 @@ static int topstar_getkeycode(struct input_dev *dev, int scancode, int *keycode)
        return 0;
 }
-static int topstar_setkeycode(struct input_dev *dev, int scancode, int keycode)
+static int topstar_setkeycode(struct input_dev *dev,
+                                unsigned int scancode, unsigned int keycode)
 {
        struct tps_key_entry *key;
        int old_keycode;
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
        key = tps_get_key_by_scancode(scancode);
        if (!key)
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index 405b969734d6..37aa14798551 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -47,6 +47,7 @@
 #include <linux/platform_device.h>
 #include <linux/rfkill.h>
 #include <linux/input.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
@@ -745,7 +746,7 @@ static struct backlight_ops toshiba_backlight_data = {
        .update_status  = set_lcd_status,
 };
-static struct key_entry *toshiba_acpi_get_entry_by_scancode(int code)
+static struct key_entry *toshiba_acpi_get_entry_by_scancode(unsigned int code)
 {
        struct key_entry *key;
@@ -756,7 +757,7 @@ static struct key_entry *toshiba_acpi_get_entry_by_scancode(int code)
        return NULL;
 }
-static struct key_entry *toshiba_acpi_get_entry_by_keycode(int code)
+static struct key_entry *toshiba_acpi_get_entry_by_keycode(unsigned int code)
 {
        struct key_entry *key;
@@ -767,8 +768,8 @@ static struct key_entry *toshiba_acpi_get_entry_by_keycode(int code)
        return NULL;
 }
-static int toshiba_acpi_getkeycode(struct input_dev *dev, int scancode,
+static int toshiba_acpi_getkeycode(struct input_dev *dev,
-                                   int *keycode)
+                                   unsigned int scancode, unsigned int *keycode)
 {
        struct key_entry *key = toshiba_acpi_get_entry_by_scancode(scancode);
@@ -780,14 +781,11 @@ static int toshiba_acpi_getkeycode(struct input_dev *dev, int scancode,
        return -EINVAL;
 }
-static int toshiba_acpi_setkeycode(struct input_dev *dev, int scancode,
+static int toshiba_acpi_setkeycode(struct input_dev *dev,
-                                   int keycode)
+                                   unsigned int scancode, unsigned int keycode)
 {
        struct key_entry *key;
-        int old_keycode;
+        unsigned int old_keycode;
-        if (keycode < 0 || keycode > KEY_MAX)
-                return -EINVAL;
        key = toshiba_acpi_get_entry_by_scancode(scancode);
        if (key && key->type == KE_KEY) {
@@ -927,6 +925,7 @@ static int __init toshiba_acpi_init(void)
        u32 hci_result;
        bool bt_present;
        int ret = 0;
+        struct backlight_properties props;
        if (acpi_disabled)
                return -ENODEV;
@@ -977,10 +976,12 @@ static int __init toshiba_acpi_init(void)
                }
        }
+        props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
        toshiba_backlight_device = backlight_device_register("toshiba",
-                                                &toshiba_acpi.p_dev->dev,
+                                                             &toshiba_acpi.p_dev->dev,
-                                                NULL,
+                                                             NULL,
-                                                &toshiba_backlight_data);
+                                                             &toshiba_backlight_data,
+                                                             &props);
        if (IS_ERR(toshiba_backlight_device)) {
                ret = PTR_ERR(toshiba_backlight_device);
@@ -989,7 +990,6 @@ static int __init toshiba_acpi_init(void)
                toshiba_acpi_exit();
                return ret;
        }
-        toshiba_backlight_device->props.max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1;
        /* Register rfkill switch for Bluetooth */
        if (hci_get_bt_present(&bt_present) == HCI_SUCCESS && bt_present) {
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 09e9918c69c1..39ec5b6c2e3a 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -33,6 +33,7 @@
 #include <linux/device.h>
 #include <linux/list.h>
 #include <linux/acpi.h>
+#include <linux/slab.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/acpi_drivers.h>