platform/x86: acer-wmi: setup accelerometer when machine has appropri…

…ate notify event

commit 98d610c upstream.

The accelerometer event relies on the ACERWMID_EVENT_GUID notify.
So, this patch changes the codes to setup accelerometer input device
when detected ACERWMID_EVENT_GUID. It avoids that the accel input
device created on every Acer machines.

In addition, patch adds a clearly parsing logic of accelerometer hid
to acer_wmi_get_handle_cb callback function. It is positive matching
the "SENR" name with "BST0001" device to avoid non-supported hardware.

Reported-by: Bjørn Mork <[email protected]>
Cc: Darren Hart <[email protected]>
Signed-off-by: Lee, Chun-Yi <[email protected]>
[andy: slightly massage commit message]
Signed-off-by: Andy Shevchenko <[email protected]>
Cc: Ben Hutchings <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

drivers/platform/x86/acer-wmi.c

@@ -1846,11 +1846,24 @@ static int __init acer_wmi_enable_lm(void)
  return status;
 }
 
+#define ACER_WMID_ACCEL_HID "BST0001"
+
 static acpi_status __init acer_wmi_get_handle_cb(acpi_handle ah, u32 level,
  void *ctx, void **retval)
 {
+ struct acpi_device *dev;
+
+ if (!strcmp(ctx, "SENR")) {
+ if (acpi_bus_get_device(ah, &dev))
+ return AE_OK;
+ if (!strcmp(ACER_WMID_ACCEL_HID, acpi_device_hid(dev)))
+ return AE_OK;
+ } else
+ return AE_OK;
+
  *(acpi_handle *)retval = ah;
- return AE_OK;
+
+ return AE_CTRL_TERMINATE;
 }
 
 static int __init acer_wmi_get_handle(const char *name, const char *prop,
@@ -1877,7 +1890,7 @@ static int __init acer_wmi_accel_setup(void)
 {
  int err;
 
- err = acer_wmi_get_handle("SENR", "BST0001", &gsensor_handle);
+ err = acer_wmi_get_handle("SENR", ACER_WMID_ACCEL_HID, &gsensor_handle);
  if (err)
  return err;
 
@@ -2233,10 +2246,11 @@ static int __init acer_wmi_init(void)
  err = acer_wmi_input_setup();
  if (err)
  return err;
+ err = acer_wmi_accel_setup();
+ if (err)
+ return err;
  }
 
- acer_wmi_accel_setup();
-
  err = platform_driver_register(&acer_platform_driver);
  if (err) {
  pr_err("Unable to register platform driver\n");