[PATCH] soc: samsung: Explicitly include correct DT includes

[PATCH] soc: samsung: Explicitly include correct DT includes

[Rob Herring]

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@kernel.org>
---
 drivers/soc/samsung/exynos-chipid.c | 1 -
 drivers/soc/samsung/exynos-pmu.c    | 2 +-
 drivers/soc/samsung/pm_domains.c    | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/samsung/exynos-chipid.c b/drivers/soc/samsung/exynos-chipid.c
index 0fb3631e7346..7ba45c4aff97 100644
--- a/drivers/soc/samsung/exynos-chipid.c
+++ b/drivers/soc/samsung/exynos-chipid.c
@@ -17,7 +17,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/slab.h>
diff --git a/drivers/soc/samsung/exynos-pmu.c b/drivers/soc/samsung/exynos-pmu.c
index 5b2664da9853..250537d7cfd6 100644
--- a/drivers/soc/samsung/exynos-pmu.c
+++ b/drivers/soc/samsung/exynos-pmu.c
@@ -7,9 +7,9 @@
 
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_device.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/syscon.h>
+#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 
diff --git a/drivers/soc/samsung/pm_domains.c b/drivers/soc/samsung/pm_domains.c
index d07f3c9d6903..9b502e8751d1 100644
--- a/drivers/soc/samsung/pm_domains.c
+++ b/drivers/soc/samsung/pm_domains.c
@@ -11,11 +11,12 @@
 
 #include <linux/io.h>
 #include <linux/err.h>
+#include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/pm_domain.h>
 #include <linux/delay.h>
+#include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_platform.h>
 #include <linux/pm_runtime.h>
 
 struct exynos_pm_domain_config {
-- 
2.40.1

RE: [PATCH] soc: samsung: Explicitly include correct DT includes

[Alim Akhtar]

> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: Friday, July 14, 2023 11:22 PM
> To: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; Alim Akhtar
> <alim.akhtar@samsung.com>
> Cc: devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
linux-
> samsung-soc@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] soc: samsung: 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.
> 
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---

Acked-by: Alim Akhtar <alim.akhtar@samsung.com>

>  drivers/soc/samsung/exynos-chipid.c | 1 -
>  drivers/soc/samsung/exynos-pmu.c    | 2 +-
>  drivers/soc/samsung/pm_domains.c    | 3 ++-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/soc/samsung/exynos-chipid.c
b/drivers/soc/samsung/exynos-
> chipid.c
> index 0fb3631e7346..7ba45c4aff97 100644
> --- a/drivers/soc/samsung/exynos-chipid.c
> +++ b/drivers/soc/samsung/exynos-chipid.c
> @@ -17,7 +17,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/slab.h>
> diff --git a/drivers/soc/samsung/exynos-pmu.c
b/drivers/soc/samsung/exynos-
> pmu.c
> index 5b2664da9853..250537d7cfd6 100644
> --- a/drivers/soc/samsung/exynos-pmu.c
> +++ b/drivers/soc/samsung/exynos-pmu.c
> @@ -7,9 +7,9 @@
> 
>  #include <linux/of.h>
>  #include <linux/of_address.h>
> -#include <linux/of_device.h>
>  #include <linux/mfd/core.h>
>  #include <linux/mfd/syscon.h>
> +#include <linux/of_platform.h>
>  #include <linux/platform_device.h>
>  #include <linux/delay.h>
> 
> diff --git a/drivers/soc/samsung/pm_domains.c
> b/drivers/soc/samsung/pm_domains.c
> index d07f3c9d6903..9b502e8751d1 100644
> --- a/drivers/soc/samsung/pm_domains.c
> +++ b/drivers/soc/samsung/pm_domains.c
> @@ -11,11 +11,12 @@
> 
>  #include <linux/io.h>
>  #include <linux/err.h>
> +#include <linux/platform_device.h>
>  #include <linux/slab.h>
>  #include <linux/pm_domain.h>
>  #include <linux/delay.h>
> +#include <linux/of.h>
>  #include <linux/of_address.h>
> -#include <linux/of_platform.h>
>  #include <linux/pm_runtime.h>
> 
>  struct exynos_pm_domain_config {
> --
> 2.40.1

Re: [PATCH] soc: samsung: Explicitly include correct DT includes

[Krzysztof Kozlowski]

On Fri, 14 Jul 2023 11:51:46 -0600, Rob Herring wrote:
> 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.
> 
> [...]

Applied, thanks!

[1/1] soc: samsung: Explicitly include correct DT includes
      https://git.kernel.org/krzk/linux/c/4c4458375c5633954eda8fb9e7d31d56836b2bbd

Best regards,
-- 
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>