iio: adc: Explicitly include correct DT includes
Subsystems (13)
PATCH 1/1 iio: adc: Explicitly include correct DT includes
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes.
--- drivers/iio/accel/adxl372_spi.c | 1 - drivers/iio/accel/bma180.c | 1 - drivers/iio/accel/kxsd9-spi.c | 1 - drivers/iio/accel/mma8452.c | 2 +- drivers/iio/adc/ad7124.c | 2 +- drivers/iio/adc/ad7192.c | 2 +- drivers/iio/adc/ad9467.c | 2 +- drivers/iio/adc/adi-axi-adc.c | 3 ++- drivers/iio/adc/at91_adc.c | 1 - drivers/iio/adc/cc10001_adc.c | 1 - drivers/iio/adc/ina2xx-adc.c | 2 +- drivers/iio/adc/meson_saradc.c | 1 - drivers/iio/adc/palmas_gpadc.c | 1 - drivers/iio/adc/qcom-spmi-iadc.c | 1 - drivers/iio/adc/rockchip_saradc.c | 1 - drivers/iio/adc/sc27xx_adc.c | 1 - drivers/iio/adc/stm32-adc-core.c | 2 ++ drivers/iio/adc/stm32-dfsdm-adc.c | 3 ++- drivers/iio/adc/stm32-dfsdm-core.c | 4 +++- drivers/iio/adc/stmpe-adc.c | 3 ++- drivers/iio/adc/sun4i-gpadc-iio.c | 1 - drivers/iio/adc/ti_am335x_adc.c | 1 - drivers/iio/proximity/isl29501.c | 2 +- drivers/iio/temperature/mlx90614.c | 2 +- 24 files changed, 18 insertions(+), 23 deletions(-)
drivers/iio/accel/adxl372_spi.c +0 -1
@@ -8,7 +8,6 @@#include <linux/module.h> #include <linux/regmap.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/spi/spi.h> #include "adxl372.h"
drivers/iio/accel/bma180.c +0 -1
@@ -16,7 +16,6 @@#include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/delay.h> -#include <linux/of_device.h> #include <linux/of.h> #include <linux/bitops.h> #include <linux/regulator/consumer.h>
drivers/iio/accel/kxsd9-spi.c +0 -1
@@ -2,7 +2,6 @@#include <linux/device.h> #include <linux/kernel.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/spi/spi.h> #include <linux/module.h> #include <linux/slab.h>
drivers/iio/accel/mma8452.c +1 -1
@@ -28,7 +28,7 @@#include <linux/iio/triggered_buffer.h> #include <linux/iio/events.h> #include <linux/delay.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/of_irq.h> #include <linux/pm_runtime.h> #include <linux/regulator/consumer.h>
drivers/iio/adc/ad7124.c +1 -1
@@ -14,7 +14,7 @@#include <linux/kernel.h> #include <linux/kfifo.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/regulator/consumer.h> #include <linux/spi/spi.h>
drivers/iio/adc/ad7192.c +1 -1
@@ -16,7 +16,7 @@#include <linux/err.h> #include <linux/sched.h> #include <linux/delay.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h>
drivers/iio/adc/ad9467.c +1 -1
@@ -13,7 +13,7 @@#include <linux/err.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/iio/iio.h>
drivers/iio/adc/adi-axi-adc.c +2 -1
@@ -11,8 +11,9 @@#include <linux/io.h> #include <linux/delay.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/slab.h> #include <linux/iio/iio.h>
drivers/iio/adc/at91_adc.c +0 -1
@@ -16,7 +16,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/sched.h> #include <linux/slab.h>
drivers/iio/adc/cc10001_adc.c +0 -1
@@ -9,7 +9,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/slab.h>
drivers/iio/adc/ina2xx-adc.c +1 -1
@@ -28,7 +28,7 @@#include <linux/iio/sysfs.h> #include <linux/kthread.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/regmap.h> #include <linux/sched/task.h> #include <linux/util_macros.h>
drivers/iio/adc/meson_saradc.c +0 -1
@@ -17,7 +17,6 @@#include <linux/interrupt.h> #include <linux/of.h> #include <linux/of_irq.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
drivers/iio/adc/palmas_gpadc.c +0 -1
@@ -18,7 +18,6 @@#include <linux/mfd/palmas.h> #include <linux/completion.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/iio/events.h> #include <linux/iio/iio.h> #include <linux/iio/machine.h>
drivers/iio/adc/qcom-spmi-iadc.c +0 -1
@@ -13,7 +13,6 @@#include <linux/mutex.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h>
drivers/iio/adc/rockchip_saradc.c +0 -1
@@ -11,7 +11,6 @@#include <linux/interrupt.h> #include <linux/io.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/clk.h> #include <linux/completion.h> #include <linux/delay.h>
drivers/iio/adc/sc27xx_adc.c +0 -1
@@ -7,7 +7,6 @@#include <linux/mutex.h> #include <linux/nvmem-consumer.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
drivers/iio/adc/stm32-adc-core.c +2 -0
@@ -18,6 +18,8 @@#include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of_device.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/regulator/consumer.h>
drivers/iio/adc/stm32-dfsdm-adc.c +2 -1
@@ -19,7 +19,8 @@#include <linux/iio/triggered_buffer.h> #include <linux/interrupt.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h>
drivers/iio/adc/stm32-dfsdm-core.c +3 -1
@@ -12,8 +12,10 @@#include <linux/iio/sysfs.h> #include <linux/interrupt.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_platform.h> #include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> #include <linux/slab.h>
drivers/iio/adc/stmpe-adc.c +2 -1
@@ -14,9 +14,10 @@#include <linux/kernel.h> #include <linux/mfd/stmpe.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/device.h> +#include <linux/of.h> #define STMPE_REG_INT_STA 0x0B#define STMPE_REG_ADC_INT_EN 0x0E
drivers/iio/adc/sun4i-gpadc-iio.c +0 -1
@@ -24,7 +24,6 @@#include <linux/io.h> #include <linux/module.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h>
drivers/iio/adc/ti_am335x_adc.c +0 -1
@@ -14,7 +14,6 @@#include <linux/io.h> #include <linux/iio/iio.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/iio/machine.h> #include <linux/iio/driver.h> #include <linux/iopoll.h>
drivers/iio/proximity/isl29501.c +1 -1
@@ -12,7 +12,7 @@#include <linux/module.h> #include <linux/i2c.h> #include <linux/err.h> -#include <linux/of_device.h> +#include <linux/mod_devicetable.h> #include <linux/iio/iio.h> #include <linux/iio/sysfs.h>
drivers/iio/temperature/mlx90614.c +1 -1
@@ -27,8 +27,8 @@#include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/jiffies.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of_device.h> #include <linux/pm_runtime.h> #include <linux/iio/iio.h>
Signature · 1 line
2.40.1
Jonathan Cameron
maintainerQuoted 10 lines · On Fri, 14 Jul 2023 11:46:26 -0600 Rob Herring <[email protected]> wrote:
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also includeplatform_device.handof.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes.Signed-off-by Rob Herring <[email protected]>
Hi Rob,
Just one in here that I noticed isn't quite right. I'd have fixed it up (and can still do so if nothing else comes up) but I want to give this more time on list anyway so won't pick it up today.
Jonathan
drivers/iio/adc/stmpe-adc.c line 20
Quoted 13 lines
drivers/iio/adc/stmpe-adc.c +2
-1@@ -14,9 +14,10 @@#include <linux/kernel.h> #include <linux/mfd/stmpe.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/device.h> +#include <linux/of.h>
Duplicate include.
Jonathan Cameron
maintainerQuoted 12 lines · On Sat, 15 Jul 2023 18:25:10 +0100 Jonathan Cameron <[email protected]> wrote:
Quoted 9 lines · On Fri, 14 Jul 2023 11:46:26 -0600 Rob Herring <[email protected]> wrote:
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also includeplatform_device.handof.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes.
Quoted 7 lines
Quoted 1 line
Signed-off-by Rob Herring <[email protected]>Hi Rob,
Just one in here that I noticed isn't quite right. I'd have fixed it up (and can still do so if nothing else comes up) but I want to give this more time on list anyway so won't pick it up today.
Fixed up whilst applying.
Applied to the togreg branch of iio.git and pushed out as testing to see if 0-day can find anything we missed.
Thanks,
Jonathan
Quoted 19 lines
Jonathan
drivers/iio/adc/stmpe-adc.c line 20
Quoted 13 lines
drivers/iio/adc/stmpe-adc.c +2
-1@@ -14,9 +14,10 @@#include <linux/kernel.h> #include <linux/mfd/stmpe.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/device.h> +#include <linux/of.h> Duplicate include.
Am Freitag, 14. Juli 2023, 19:46:26 CEST schrieb Rob Herring:
Quoted 9 lines
The DT
of_device.handof_platform.hdate back to the separateof_platform_bus_typebefore it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also includeplatform_device.handof.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes.
Quoted 4 lines
Signed-off-by Rob Herring <[email protected]>---
drivers/iio/adc/rockchip_saradc.c | 1 -
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel