Merge branch 'ib-5.8-jz47xx-ts' into HEAD

[platform/kernel/linux-rpi.git] / drivers / iio / adc / ingenic-adc.c

diff --git a/drivers/iio/adc/ingenic-adc.c b/drivers/iio/adc/ingenic-adc.c
index c5b0176..92b2508 100644 (file)
--- a/drivers/iio/adc/ingenic-adc.c
+++ b/drivers/iio/adc/ingenic-adc.c
@@ -15,6 +15,7 @@
 #include <linux/iopoll.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/mod_devicetable.h>
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 
@@ -794,7 +795,6 @@ static int ingenic_adc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       iio_dev->dev.parent = dev;
        iio_dev->name = "jz-adc";
        iio_dev->modes = INDIO_DIRECT_MODE | INDIO_BUFFER_SOFTWARE;
        iio_dev->setup_ops = &ingenic_buffer_setup_ops;
@@ -809,7 +809,6 @@ static int ingenic_adc_probe(struct platform_device *pdev)
        return ret;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id ingenic_adc_of_match[] = {
        { .compatible = "ingenic,jz4725b-adc", .data = &jz4725b_adc_soc_data, },
        { .compatible = "ingenic,jz4740-adc", .data = &jz4740_adc_soc_data, },
@@ -817,12 +816,11 @@ static const struct of_device_id ingenic_adc_of_match[] = {
        { },
 };
 MODULE_DEVICE_TABLE(of, ingenic_adc_of_match);
-#endif
 
 static struct platform_driver ingenic_adc_driver = {
        .driver = {
                .name = "ingenic-adc",
-               .of_match_table = of_match_ptr(ingenic_adc_of_match),
+               .of_match_table = ingenic_adc_of_match,
        },
        .probe = ingenic_adc_probe,
 };