iio:adc:bcm_iproc: Drop of_match_ptr protection and switch to mod_devicetable.h

This driver cannot be instantiated from ACPI due to it's use of
syscon_regmap_lookup_by_phandle() but in the interests of clearing
this anti pattern out of IIO, let us switch to an explicit
check in Kconfig and remove the protections on the of_match_table
The switch of header is because we only use of_device_id
in here and that is defined in mod_devicetable.h not of.h.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Raveendra Padasalagi <raveendra.padasalagi@broadcom.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 66d9cc07315735f45a716b3dcda0f45804b889d4..f495d01a79b979766b684c9659faab10a0efa92e 100644 (file)
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -340,7 +340,7 @@ config AXP288_ADC
 
 config BCM_IPROC_ADC
        tristate "Broadcom IPROC ADC driver"
-       depends on ARCH_BCM_IPROC || COMPILE_TEST
+       depends on (ARCH_BCM_IPROC && OF) || COMPILE_TEST
        depends on MFD_SYSCON
        default ARCH_BCM_CYGNUS
        help

diff --git a/drivers/iio/adc/bcm_iproc_adc.c b/drivers/iio/adc/bcm_iproc_adc.c
index 936da32faa9d26c4e58252b1c1a2632f0f73b3c0..44e1e53ada729490bf6277c9252e93189e821c16 100644 (file)
--- a/drivers/iio/adc/bcm_iproc_adc.c
+++ b/drivers/iio/adc/bcm_iproc_adc.c
@@ -4,7 +4,7 @@
  */
 
 #include <linux/module.h>
-#include <linux/of.h>
+#include <linux/mod_devicetable.h>
 #include <linux/io.h>
 #include <linux/clk.h>
 #include <linux/mfd/syscon.h>
@@ -617,7 +617,7 @@ static struct platform_driver iproc_adc_driver = {
        .remove = iproc_adc_remove,
        .driver = {
                .name   = "iproc-static-adc",
-               .of_match_table = of_match_ptr(iproc_adc_of_match),
+               .of_match_table = iproc_adc_of_match,
        },
 };
 module_platform_driver(iproc_adc_driver);