Merge tag 'platform-drivers-x86-v4.16-5' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform drivers fixes from Andy Shevchenko:

 - fix a regression on laptops like Dell XPS 9360 where keyboard stopped
   working.

 - correct sysfs wakeup attribute after removal of some drivers to
   reflect that they are not able to wake system up anymore.

* tag 'platform-drivers-x86-v4.16-5' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: wmi: Fix misuse of vsprintf extension %pULL
  platform/x86: intel-hid: Reset wakeup capable flag on removal
  platform/x86: intel-vbtn: Reset wakeup capable flag on removal
  platform/x86: intel-vbtn: Only activate tablet mode switch on 2-in-1's

3 files changed, 34 insertions, 20 deletions

diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index d1a01311c1a2..5e3df194723e 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -376,6 +376,7 @@ static int intel_hid_remove(struct platform_device *device)
 {
         acpi_handle handle = ACPI_HANDLE(&device->dev);
 
+        device_init_wakeup(&device->dev, false);
         acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
         intel_hid_set_enable(&device->dev, false);
         intel_button_array_enable(&device->dev, false);
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index b703d6f5b099..c13780b8dabb 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/acpi.h>
+#include <linux/dmi.h>
 #include <linux/input.h>
 #include <linux/input/sparse-keymap.h>
 #include <linux/kernel.h>
@@ -97,9 +98,35 @@ out_unknown:
         dev_dbg(&device->dev, "unknown event index 0x%x\n", event);
 }
 
-static int intel_vbtn_probe(struct platform_device *device)
+static void detect_tablet_mode(struct platform_device *device)
 {
+        const char *chassis_type = dmi_get_system_info(DMI_CHASSIS_TYPE);
+        struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
+        acpi_handle handle = ACPI_HANDLE(&device->dev);
         struct acpi_buffer vgbs_output = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *obj;
+        acpi_status status;
+        int m;
+
+        if (!(chassis_type && strcmp(chassis_type, "31") == 0))
+                goto out;
+
+        status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
+        if (ACPI_FAILURE(status))
+                goto out;
+
+        obj = vgbs_output.pointer;
+        if (!(obj && obj->type == ACPI_TYPE_INTEGER))
+                goto out;
+
+        m = !(obj->integer.value & TABLET_MODE_FLAG);
+        input_report_switch(priv->input_dev, SW_TABLET_MODE, m);
+out:
+        kfree(vgbs_output.pointer);
+}
+
+static int intel_vbtn_probe(struct platform_device *device)
+{
         acpi_handle handle = ACPI_HANDLE(&device->dev);
         struct intel_vbtn_priv *priv;
         acpi_status status;
@@ -122,22 +149,7 @@ static int intel_vbtn_probe(struct platform_device *device)
                 return err;
         }
 
-        /*
-         * VGBS being present and returning something means we have
-         * a tablet mode switch.
-         */
-        status = acpi_evaluate_object(handle, "VGBS", NULL, &vgbs_output);
-        if (ACPI_SUCCESS(status)) {
-                union acpi_object *obj = vgbs_output.pointer;
-
-                if (obj && obj->type == ACPI_TYPE_INTEGER) {
-                        int m = !(obj->integer.value & TABLET_MODE_FLAG);
-
-                        input_report_switch(priv->input_dev, SW_TABLET_MODE, m);
-                }
-        }
-
-        kfree(vgbs_output.pointer);
+        detect_tablet_mode(device);
 
         status = acpi_install_notify_handler(handle,
                                              ACPI_DEVICE_NOTIFY,
@@ -154,6 +166,7 @@ static int intel_vbtn_remove(struct platform_device *device)
 {
         acpi_handle handle = ACPI_HANDLE(&device->dev);
 
+        device_init_wakeup(&device->dev, false);
         acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler);
 
         /*
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index c0c8945603cb..8796211ef24a 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -945,7 +945,7 @@ static int wmi_dev_probe(struct device *dev)
                 wblock->char_dev.mode = 0444;
                 ret = misc_register(&wblock->char_dev);
                 if (ret) {
-                        dev_warn(dev, "failed to register char dev: %d", ret);
+                        dev_warn(dev, "failed to register char dev: %d\n", ret);
                         ret = -ENOMEM;
                         goto probe_misc_failure;
                 }
@@ -1048,7 +1048,7 @@ static int wmi_create_device(struct device *wmi_bus_dev,
 
         if (result) {
                 dev_warn(wmi_bus_dev,
-                         "%s data block query control method not found",
+                         "%s data block query control method not found\n",
                          method);
                 return result;
         }
@@ -1198,7 +1198,7 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device)
 
                 retval = device_add(&wblock->dev.dev);
                 if (retval) {
-                        dev_err(wmi_bus_dev, "failed to register %pULL\n",
+                        dev_err(wmi_bus_dev, "failed to register %pUL\n",
                                 wblock->gblock.guid);
                         if (debug_event)
                                 wmi_method_enable(wblock, 0);