korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-27 14:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

iio: accel: kxsd9-i2c: Use mod_devicetable.h and drop of_match_ptr macro

Browse Source 
Enables ACPI DSDT to probe via PRP0001 and the compatible property. Also
removes the ifdef protections for CONFIG_OF.

Signed-off-by: Nishant Malpani <nish.malpani25@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Nishant Malpani 2020-04-25 04:14:38 +05:30 committed by Jonathan Cameron
parent 6d6c5e56d7
commit 3699e268a7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/iio/accel/kxsd9-i2c.c
View File

@ -2,6 +2,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -36,15 +37,11 @@ static int kxsd9_i2c_remove(struct i2c_client *client)
return kxsd9_common_remove(&client->dev); return kxsd9_common_remove(&client->dev);
} }
#ifdef CONFIG_OF
static const struct of_device_id kxsd9_of_match[] = { static const struct of_device_id kxsd9_of_match[] = {
{ .compatible = "kionix,kxsd9", }, { .compatible = "kionix,kxsd9", },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, kxsd9_of_match); MODULE_DEVICE_TABLE(of, kxsd9_of_match);
#else
#define kxsd9_of_match NULL
#endif
static const struct i2c_device_id kxsd9_i2c_id[] = { static const struct i2c_device_id kxsd9_i2c_id[] = {
{"kxsd9", 0}, {"kxsd9", 0},
@ -55,7 +52,7 @@ MODULE_DEVICE_TABLE(i2c, kxsd9_i2c_id);
static struct i2c_driver kxsd9_i2c_driver = { static struct i2c_driver kxsd9_i2c_driver = {
.driver = { .driver = {
.name = "kxsd9", .name = "kxsd9",
.of_match_table = of_match_ptr(kxsd9_of_match), .of_match_table = kxsd9_of_match,
.pm = &kxsd9_dev_pm_ops, .pm = &kxsd9_dev_pm_ops,
}, },
.probe = kxsd9_i2c_probe, .probe = kxsd9_i2c_probe,