reset: Explicitly include correct DT includes
Subsystems (10)
PATCH 1/1 reset: 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/reset/hisilicon/hi6220_reset.c | 1 - drivers/reset/hisilicon/reset-hi3660.c | 2 +- drivers/reset/reset-imx7.c | 2 +- drivers/reset/reset-intel-gw.c | 2 +- drivers/reset/reset-k210.c | 1 - drivers/reset/reset-meson-audio-arb.c | 3 ++- drivers/reset/reset-meson.c | 1 - drivers/reset/reset-microchip-sparx5.c | 3 ++- drivers/reset/reset-mpfs.c | 1 + drivers/reset/reset-qcom-aoss.c | 2 +- drivers/reset/reset-qcom-pdc.c | 2 +- drivers/reset/reset-simple.c | 1 - drivers/reset/reset-uniphier-glue.c | 2 +- drivers/reset/reset-uniphier.c | 1 - drivers/reset/reset-zynqmp.c | 1 - 15 files changed, 11 insertions(+), 14 deletions(-)
drivers/reset/hisilicon/hi6220_reset.c +0 -1
@@ -13,7 +13,6 @@#include <linux/module.h> #include <linux/bitops.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h> #include <linux/reset-controller.h>
drivers/reset/hisilicon/reset-hi3660.c +1 -1
@@ -6,7 +6,7 @@#include <linux/kernel.h> #include <linux/mfd/syscon.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset-controller.h>
drivers/reset/reset-imx7.c +1 -1
@@ -9,7 +9,7 @@#include <linux/mfd/syscon.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/regmap.h>
drivers/reset/reset-intel-gw.c +1 -1
@@ -6,7 +6,7 @@#include <linux/bitfield.h> #include <linux/init.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reboot.h> #include <linux/regmap.h>
drivers/reset/reset-k210.c +0 -1
@@ -3,7 +3,6 @@* Copyright (c) 2020 Western Digital Corporation or its affiliates. */ #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/delay.h>
drivers/reset/reset-meson-audio-arb.c +2 -1
@@ -5,7 +5,8 @@#include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/spinlock.h>
drivers/reset/reset-meson.c +0 -1
@@ -14,7 +14,6 @@#include <linux/reset-controller.h> #include <linux/slab.h> #include <linux/types.h> -#include <linux/of_device.h> #define BITS_PER_REG 32
drivers/reset/reset-microchip-sparx5.c +2 -1
@@ -7,9 +7,10 @@* https://github.com/microchip-ung/sparx-5_reginfo */ #include <linux/mfd/syscon.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/reset-controller.h>
drivers/reset/reset-mpfs.c +1 -0
@@ -9,6 +9,7 @@#include <linux/auxiliary_bus.h> #include <linux/delay.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <dt-bindings/clock/microchip,mpfs-clock.h>
drivers/reset/reset-qcom-aoss.c +1 -1
@@ -8,7 +8,7 @@#include <linux/reset-controller.h> #include <linux/delay.h> #include <linux/io.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <dt-bindings/reset/qcom,sdm845-aoss.h> struct qcom_aoss_reset_map {
drivers/reset/reset-qcom-pdc.c +1 -1
@@ -4,7 +4,7 @@*/ #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset-controller.h>
drivers/reset/reset-simple.c +0 -1
@@ -16,7 +16,6 @@#include <linux/err.h> #include <linux/io.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/reset/reset-simple.h>
drivers/reset/reset-uniphier-glue.c +1 -1
@@ -6,7 +6,7 @@#include <linux/clk.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset.h> #include <linux/reset/reset-simple.h>
drivers/reset/reset-uniphier.c +0 -1
@@ -7,7 +7,6 @@#include <linux/mfd/syscon.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/reset-controller.h>
drivers/reset/reset-zynqmp.c +0 -1
@@ -9,7 +9,6 @@#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/firmware/xlnx-zynqmp.h> -#include <linux/of_device.h> #define ZYNQMP_NR_RESETS (ZYNQMP_PM_RESET_END - ZYNQMP_PM_RESET_START)#define ZYNQMP_RESET_ID ZYNQMP_PM_RESET_START
Signature · 7 lines
2.40.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 10 lines · Rob Herring
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]>
Signature · 8 lines
Damien Le Moal Western Digital Research _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Rob,
Quoted 229 lines · Rob Herring
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
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]>---
drivers/reset/hisilicon/hi6220_reset.c | 1 -
drivers/reset/hisilicon/reset-hi3660.c | 2 +-
drivers/reset/reset-imx7.c | 2 +-
drivers/reset/reset-intel-gw.c | 2 +-
drivers/reset/reset-k210.c | 1 -
drivers/reset/reset-meson-audio-arb.c | 3 ++-
drivers/reset/reset-meson.c | 1 -
drivers/reset/reset-microchip-sparx5.c | 3 ++-
drivers/reset/reset-mpfs.c | 1 +
drivers/reset/reset-qcom-aoss.c | 2 +-
drivers/reset/reset-qcom-pdc.c | 2 +-
drivers/reset/reset-simple.c | 1 -
drivers/reset/reset-uniphier-glue.c | 2 +-
drivers/reset/reset-uniphier.c | 1 -
drivers/reset/reset-zynqmp.c | 1 -15 files changed, 11 insertions(+), 14 deletions(-)drivers/reset/hisilicon/hi6220_reset.c +0
-1@@ -13,7 +13,6 @@ #include <linux/module.h> #include <linux/bitops.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h> #include <linux/reset-controller.h>drivers/reset/hisilicon/reset-hi3660.c +1
-1@@ -6,7 +6,7 @@ #include <linux/kernel.h> #include <linux/mfd/syscon.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset-controller.h>drivers/reset/reset-imx7.c +1
-1@@ -9,7 +9,7 @@ #include <linux/mfd/syscon.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/regmap.h>drivers/reset/reset-intel-gw.c +1
-1@@ -6,7 +6,7 @@ #include <linux/bitfield.h> #include <linux/init.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reboot.h> #include <linux/regmap.h>drivers/reset/reset-k210.c +0
-1@@ -3,7 +3,6 @@* Copyright (c) 2020 Western Digital Corporation or its affiliates. */ #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/delay.h>drivers/reset/reset- renamed from drivers/reset/reset-meson-audio-arb.c +0
-0
meson-audio-arb.c
index6a3f6a6a3bbf..7e46dbc04998100644drivers/reset/reset-meson-audio-arb.c +2
-1@@ -5,7 +5,8 @@ #include <linux/clk.h> #include <linux/io.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/spinlock.h>drivers/reset/reset-meson.c +0
-1@@ -14,7 +14,6 @@ #include <linux/reset-controller.h> #include <linux/slab.h> #include <linux/types.h> -#include <linux/of_device.h> #define BITS_PER_REG 32drivers/reset/reset- renamed from drivers/reset/reset-microchip-sparx5.c +0
-0
microchip-sparx5.c
indexead25942061d..636e85c388b0100644drivers/reset/reset-microchip-sparx5.c +2
-1@@ -7,9 +7,10 @@* https://github.com/microchip-ung/sparx-5_reginfo */ #include <linux/mfd/syscon.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/property.h> #include <linux/regmap.h> #include <linux/reset-controller.h>drivers/reset/reset-mpfs.c +1
-0@@ -9,6 +9,7 @@ #include <linux/auxiliary_bus.h> #include <linux/delay.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <dt-bindings/clock/microchip,mpfs-clock.h>drivers/reset/reset-qcom-aoss.c +1
-1@@ -8,7 +8,7 @@ #include <linux/reset-controller.h> #include <linux/delay.h> #include <linux/io.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <dt-bindings/reset/qcom,sdm845-aoss.h> struct qcom_aoss_reset_map {drivers/reset/reset-qcom-pdc.c +1
-1@@ -4,7 +4,7 @@*/ #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset-controller.h>drivers/reset/reset-simple.c +0
-1@@ -16,7 +16,6 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/of.h> -#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/reset/reset-simple.h>drivers/reset/reset- renamed from drivers/reset/reset-uniphier-glue.c +0
-0
uniphier-glue.c
index15abac9fc72c..38aa953855aa100644drivers/reset/reset-uniphier-glue.c +1
-1@@ -6,7 +6,7 @@ #include <linux/clk.h> #include <linux/module.h> -#include <linux/of_device.h> +#include <linux/of.h> #include <linux/platform_device.h> #include <linux/reset.h> #include <linux/reset/reset-simple.h>drivers/reset/reset-uniphier.c +0
-1@@ -7,7 +7,6 @@ #include <linux/mfd/syscon.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/reset-controller.h>drivers/reset/reset-zynqmp.c +0
-2@@ -9,7 +9,6 @@ #include <linux/platform_device.h> #include <linux/reset-controller.h> #include <linux/firmware/xlnx-zynqmp.h> -#include <linux/of_device.h> #define ZYNQMP_NR_RESETS (ZYNQMP_PM_RESET_END - ZYNQMP_PM_RESET_START) #define ZYNQMP_RESET_ID ZYNQMP_PM_RESET_START --
Quoted 2 lines
2.40.1
BR
Steen
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel