Re: [PATCH 2/3] iio: accel: kxsd9-i2c: Use mod_devicetable.h and drop of_match_ptr macro

Jonathan Cameron
2020-04-25T14:36:33Z

On Sat, 25 Apr 2020 04:14:38 +0530
Nishant Malpani <nish.malpani25@gmail.com> wrote:

> 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>

Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.

Thanks,

Jonathan

> ---
> drivers/iio/accel/kxsd9-i2c.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c
> index b6f3de7ef8ea..b580d605f848 100644
> --- a/drivers/iio/accel/kxsd9-i2c.c
> +++ b/drivers/iio/accel/kxsd9-i2c.c
> @@ -2,6 +2,7 @@
> #include <linux/device.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/mod_devicetable.h>
> #include <linux/slab.h>
> #include <linux/i2c.h>
> #include <linux/delay.h>
> @@ -36,15 +37,11 @@ static int kxsd9_i2c_remove(struct i2c_client *client)
> return kxsd9_common_remove(&client->dev);
> }
>
> -#ifdef CONFIG_OF
> static const struct of_device_id kxsd9_of_match[] = {
> { .compatible = "kionix,kxsd9", },
> { },
> };
> MODULE_DEVICE_TABLE(of, kxsd9_of_match);
> -#else
> -#define kxsd9_of_match NULL
> -#endif
>
> static const struct i2c_device_id kxsd9_i2c_id[] = {
> {"kxsd9", 0},
> @@ -55,7 +52,7 @@ MODULE_DEVICE_TABLE(i2c, kxsd9_i2c_id);
> static struct i2c_driver kxsd9_i2c_driver = {
> .driver = {
> .name = "kxsd9",
> - .of_match_table = of_match_ptr(kxsd9_of_match),
> + .of_match_table = kxsd9_of_match,
> .pm = &kxsd9_dev_pm_ops,
> },
> .probe = kxsd9_i2c_probe,