iio: adc: at91_adc: add Kconfig dep on the OF symbol and remove of_match_ptr()
authorAlexandru Ardelean <alexandru.ardelean@analog.com>
Wed, 30 Sep 2020 13:50:47 +0000 (16:50 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:52:55 +0000 (11:52 +0100)
[ Upstream commit f091d7c5fe6cc39e916b50f90e3cac67a032d0be ]

This tries to solve a warning reported by the lkp bot:

>> drivers/iio/adc/at91_adc.c:1439:34: warning: unused variable
>> 'at91_adc_dt_ids' [-Wunused-const-variable]
   static const struct of_device_id at91_adc_dt_ids[] = {
                                    ^
   1 warning generated.

This warning has appeared after the AT91_ADC driver compilation has been
enabled via the COMPILE_TEST symbol dependency.

The warning is caused by the 'of_match_ptr()' helper which returns NULL if
OF is undefined. This driver should build only for device-tree context, so
a dependency on the OF Kconfig symbol has been added.
Also, the usage of of_match_ptr() helper has been removed since it
shouldn't ever return NULL (because the driver should not be built for the
non-OF context).

Fixes: 4027860dcc4c ("iio: Kconfig: at91_adc: add COMPILE_TEST dependency to driver")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200930135048.11530-4-alexandru.ardelean@analog.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iio/adc/Kconfig
drivers/iio/adc/at91_adc.c

index 91ae905..17e9ceb 100644 (file)
@@ -295,7 +295,7 @@ config ASPEED_ADC
 config AT91_ADC
        tristate "Atmel AT91 ADC"
        depends on ARCH_AT91 || COMPILE_TEST
-       depends on INPUT && SYSFS
+       depends on INPUT && SYSFS && OF
        select IIO_BUFFER
        select IIO_TRIGGERED_BUFFER
        help
index 9b2c548..0a793e7 100644 (file)
@@ -1469,7 +1469,7 @@ static struct platform_driver at91_adc_driver = {
        .id_table = at91_adc_ids,
        .driver = {
                   .name = DRIVER_NAME,
-                  .of_match_table = of_match_ptr(at91_adc_dt_ids),
+                  .of_match_table = at91_adc_dt_ids,
                   .pm = &at91_adc_pm_ops,
        },
 };