Merge branch 'misc' into test

6 files changed, 9 insertions, 8 deletions

diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c
index 7c6dfd03de9f..57d81c713eab 100644
--- a/drivers/misc/asus-laptop.c
+++ b/drivers/misc/asus-laptop.c
@@ -139,6 +139,7 @@ ASUS_HANDLE(lcd_switch, "\\_SB.PCI0.SBRG.EC0._Q10",	/* All new models */
             "\\_SB.PCI0.PX40.ECD0._Q10",        /* L3C */
             "\\_SB.PCI0.PX40.EC0.Q10",  /* M1A */
             "\\_SB.PCI0.LPCB.EC0._Q10", /* P30 */
+            "\\_SB.PCI0.LPCB.EC0._Q0E", /* P30/P35 */
             "\\_SB.PCI0.PX40.Q10",      /* S1x */
             "\\Q10");           /* A2x, L2D, L3D, M2E */
 
@@ -350,7 +351,7 @@ static void write_status(acpi_handle handle, int out, int mask)
         static void object##_led_set(struct led_classdev *led_cdev,     \
                                      enum led_brightness value)         \
         {                                                               \
-                object##_led_wk = value;                                \
+                object##_led_wk = (value > 0) ? 1 : 0;                  \
                 queue_work(led_workqueue, &object##_led_work);          \
         }                                                               \
         static void object##_led_update(struct work_struct *ignored)    \
@@ -996,7 +997,7 @@ static int asus_hotk_add(struct acpi_device *device)
         hotk->handle = device->handle;
         strcpy(acpi_device_name(device), ASUS_HOTK_DEVICE_NAME);
         strcpy(acpi_device_class(device), ASUS_HOTK_CLASS);
-        acpi_driver_data(device) = hotk;
+        device->driver_data = hotk;
         hotk->device = device;
 
         result = asus_hotk_check();
diff --git a/drivers/misc/eeepc-laptop.c b/drivers/misc/eeepc-laptop.c
index 5baa10bcaf6d..7b39e0f0f1be 100644
--- a/drivers/misc/eeepc-laptop.c
+++ b/drivers/misc/eeepc-laptop.c
@@ -554,7 +554,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
         ehotk->handle = device->handle;
         strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME);
         strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS);
-        acpi_driver_data(device) = ehotk;
+        device->driver_data = ehotk;
         ehotk->device = device;
         result = eeepc_hotk_check();
         if (result)
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index f861db072777..8555a17f00ef 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -508,7 +508,7 @@ static int acpi_fujitsu_add(struct acpi_device *device)
         fujitsu->acpi_handle = device->handle;
         sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_DEVICE_NAME);
         sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS);
-        acpi_driver_data(device) = fujitsu;
+        device->driver_data = fujitsu;
 
         status = acpi_install_notify_handler(device->handle,
                                              ACPI_DEVICE_NOTIFY,
@@ -718,7 +718,7 @@ static int acpi_fujitsu_hotkey_add(struct acpi_device *device)
         sprintf(acpi_device_name(device), "%s",
                 ACPI_FUJITSU_HOTKEY_DEVICE_NAME);
         sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS);
-        acpi_driver_data(device) = fujitsu_hotkey;
+        device->driver_data = fujitsu_hotkey;
 
         status = acpi_install_notify_handler(device->handle,
                                              ACPI_DEVICE_NOTIFY,
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c
index 80a136352408..cd3ea7faa5b6 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/misc/intel_menlow.c
@@ -175,7 +175,7 @@ static int intel_menlow_memory_add(struct acpi_device *device)
                 goto end;
         }
 
-        acpi_driver_data(device) = cdev;
+        device->driver_data = cdev;
         result = sysfs_create_link(&device->dev.kobj,
                                 &cdev->device.kobj, "thermal_cooling");
         if (result)
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 60775be22822..5a97d3a9d745 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -970,7 +970,7 @@ static int sony_nc_resume(struct acpi_device *device)
         /* set the last requested brightness level */
         if (sony_backlight_device &&
                         !sony_backlight_update_status(sony_backlight_device))
-                printk(KERN_WARNING DRV_PFX "unable to restore brightness level");
+                printk(KERN_WARNING DRV_PFX "unable to restore brightness level\n");
 
         /* re-initialize models with specific requirements */
         dmi_check_system(sony_nc_ids);
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index 6b9300779a43..62aebaa85913 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -543,7 +543,7 @@ static int __init setup_acpi_notify(struct ibm_struct *ibm)
                 return -ENODEV;
         }
 
-        acpi_driver_data(ibm->acpi->device) = ibm;
+        ibm->acpi->device->driver_data = ibm;
         sprintf(acpi_device_class(ibm->acpi->device), "%s/%s",
                 TPACPI_ACPI_EVENT_PREFIX,
                 ibm->name);