]> git.baikalelectronics.ru Git - kernel.git/commitdiff
iio: light: gp2ap020a00f: Swap of.h for mod_devicetable.h + drop of_match_ptr
authorJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 19 Apr 2020 15:02:03 +0000 (16:02 +0100)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 25 Apr 2020 14:42:22 +0000 (15:42 +0100)
Also drops ifdef protections for CONFIG_OF.

Enables probing via ACPI PRP0001 and removes an example that might be
cut and paste into new drivers.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
drivers/iio/light/gp2ap020a00f.c

index 7fbbce0d4bc707448cfffb68e619de2395528611..070d4cd0cf54e5980604ed769c1e1fd950676dd6 100644 (file)
@@ -38,8 +38,8 @@
 #include <linux/irq.h>
 #include <linux/irq_work.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
-#include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
@@ -1617,18 +1617,16 @@ static const struct i2c_device_id gp2ap020a00f_id[] = {
 
 MODULE_DEVICE_TABLE(i2c, gp2ap020a00f_id);
 
-#ifdef CONFIG_OF
 static const struct of_device_id gp2ap020a00f_of_match[] = {
        { .compatible = "sharp,gp2ap020a00f" },
        { }
 };
 MODULE_DEVICE_TABLE(of, gp2ap020a00f_of_match);
-#endif
 
 static struct i2c_driver gp2ap020a00f_driver = {
        .driver = {
                .name   = GP2A_I2C_NAME,
-               .of_match_table = of_match_ptr(gp2ap020a00f_of_match),
+               .of_match_table = gp2ap020a00f_of_match,
        },
        .probe          = gp2ap020a00f_probe,
        .remove         = gp2ap020a00f_remove,