| From 1d950daef01fa35d26600c34e4820485f56a0f19 Mon Sep 17 00:00:00 2001 |
| From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> |
| Date: Thu, 3 Nov 2016 08:18:52 +0800 |
| Subject: [PATCH] platform/x86: acer-wmi: setup accelerometer when machine has |
| appropriate notify event |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 98d610c3739ac354319a6590b915f4624d9151e6 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 <bjorn@mork.no> |
| Cc: Darren Hart <dvhart@infradead.org> |
| Signed-off-by: Lee, Chun-Yi <jlee@suse.com> |
| [andy: slightly massage commit message] |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c |
| index a66192f692e3..c29b9b611ab2 100644 |
| --- a/drivers/platform/x86/acer-wmi.c |
| +++ b/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"); |
| -- |
| 2.12.0 |
| |