summaryrefslogtreecommitdiff
path: root/drivers/input/misc/adxl34x-i2c.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-01-03 22:51:48 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-03 23:33:12 +0300
commit01427fe7c4b956b878e55e966690624a3624e991 (patch)
tree20b45bd749304ccd21b4348ceafe57e115fe0923 /drivers/input/misc/adxl34x-i2c.c
parent47e3a5edc6538d66e470aaed3b7c57255cb37ca1 (diff)
downloadlinux-01427fe7c4b956b878e55e966690624a3624e991.tar.xz
Input: adxl34x - make it enumerable in ACPI environment
The ACPI-enabled platform may contain _DSD method to enable this driver using compatible string. Remove OF specifics to re-use existing code on ACPI-enabled platforms. Suggested-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc/adxl34x-i2c.c')
-rw-r--r--drivers/input/misc/adxl34x-i2c.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34x-i2c.c
index a8b0a2eec344..7fed92fb8cc1 100644
--- a/drivers/input/misc/adxl34x-i2c.c
+++ b/drivers/input/misc/adxl34x-i2c.c
@@ -136,7 +136,6 @@ static const struct i2c_device_id adxl34x_id[] = {
MODULE_DEVICE_TABLE(i2c, adxl34x_id);
-#ifdef CONFIG_OF
static const struct of_device_id adxl34x_of_id[] = {
/*
* The ADXL346 is backward-compatible with the ADXL345. Differences are
@@ -153,13 +152,12 @@ static const struct of_device_id adxl34x_of_id[] = {
};
MODULE_DEVICE_TABLE(of, adxl34x_of_id);
-#endif
static struct i2c_driver adxl34x_driver = {
.driver = {
.name = "adxl34x",
.pm = &adxl34x_i2c_pm,
- .of_match_table = of_match_ptr(adxl34x_of_id),
+ .of_match_table = adxl34x_of_id,
},
.probe = adxl34x_i2c_probe,
.remove = adxl34x_i2c_remove,