Re: [PATCH] reset: Explicitly include correct DT includes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Rob,

On Fri, 2023-07-14 at 11:49 -0600, Rob Herring wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the
> content is safe
> 
> 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.
> 
> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> ---
>  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(-)
> 
> diff --git a/drivers/reset/hisilicon/hi6220_reset.c
> b/drivers/reset/hisilicon/hi6220_reset.c
> index 5ca145b64e63..8d1fce18ded7 100644
> --- a/drivers/reset/hisilicon/hi6220_reset.c
> +++ b/drivers/reset/hisilicon/hi6220_reset.c
> @@ -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>
> diff --git a/drivers/reset/hisilicon/reset-hi3660.c
> b/drivers/reset/hisilicon/reset-hi3660.c
> index 965f5ceba7d8..087f28e326ee 100644
> --- a/drivers/reset/hisilicon/reset-hi3660.c
> +++ b/drivers/reset/hisilicon/reset-hi3660.c
> @@ -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>
> diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
> index d2408725eb2c..dd01fe11c5cb 100644
> --- a/drivers/reset/reset-imx7.c
> +++ b/drivers/reset/reset-imx7.c
> @@ -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>
> diff --git a/drivers/reset/reset-intel-gw.c b/drivers/reset/reset-intel-gw.c
> index effc177db80a..a5a01388ae7f 100644
> --- a/drivers/reset/reset-intel-gw.c
> +++ b/drivers/reset/reset-intel-gw.c
> @@ -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>
> diff --git a/drivers/reset/reset-k210.c b/drivers/reset/reset-k210.c
> index 1b6e03522b40..b62a2fd44e4e 100644
> --- a/drivers/reset/reset-k210.c
> +++ b/drivers/reset/reset-k210.c
> @@ -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>
> diff --git a/drivers/reset/reset-meson-audio-arb.c b/drivers/reset/reset-
> meson-audio-arb.c
> index 6a3f6a6a3bbf..7e46dbc04998 100644
> --- a/drivers/reset/reset-meson-audio-arb.c
> +++ b/drivers/reset/reset-meson-audio-arb.c
> @@ -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>
> 
> diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
> index 13878ca2779d..89ac99789a3c 100644
> --- a/drivers/reset/reset-meson.c
> +++ b/drivers/reset/reset-meson.c
> @@ -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
> 
> diff --git a/drivers/reset/reset-microchip-sparx5.c b/drivers/reset/reset-
> microchip-sparx5.c
> index ead25942061d..636e85c388b0 100644
> --- a/drivers/reset/reset-microchip-sparx5.c
> +++ b/drivers/reset/reset-microchip-sparx5.c
> @@ -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>
> 
> diff --git a/drivers/reset/reset-mpfs.c b/drivers/reset/reset-mpfs.c
> index e71ab73092ab..7f3fb2d472f4 100644
> --- a/drivers/reset/reset-mpfs.c
> +++ b/drivers/reset/reset-mpfs.c
> @@ -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>
> diff --git a/drivers/reset/reset-qcom-aoss.c b/drivers/reset/reset-qcom-aoss.c
> index 9333b923dda0..f52e90e36194 100644
> --- a/drivers/reset/reset-qcom-aoss.c
> +++ b/drivers/reset/reset-qcom-aoss.c
> @@ -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 {
> diff --git a/drivers/reset/reset-qcom-pdc.c b/drivers/reset/reset-qcom-pdc.c
> index f22bb49a4ac8..a3aae3f902e6 100644
> --- a/drivers/reset/reset-qcom-pdc.c
> +++ b/drivers/reset/reset-qcom-pdc.c
> @@ -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>
> diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c
> index 361a68314265..7ea5adbf2097 100644
> --- a/drivers/reset/reset-simple.c
> +++ b/drivers/reset/reset-simple.c
> @@ -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>
> diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-
> uniphier-glue.c
> index 15abac9fc72c..38aa953855aa 100644
> --- a/drivers/reset/reset-uniphier-glue.c
> +++ b/drivers/reset/reset-uniphier-glue.c
> @@ -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>
> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
> index ff7580f38056..79c43c204d46 100644
> --- a/drivers/reset/reset-uniphier.c
> +++ b/drivers/reset/reset-uniphier.c
> @@ -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>
> diff --git a/drivers/reset/reset-zynqmp.c b/drivers/reset/reset-zynqmp.c
> index 59dc0ff9af9e..f0f64ad3472b 100644
> --- a/drivers/reset/reset-zynqmp.c
> +++ b/drivers/reset/reset-zynqmp.c
> @@ -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
> --
> 2.40.1
> 

Acked-by: Steen Hegelund <Steen.Hegelund@xxxxxxxxxxxxx>

BR
Steen




[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux