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

[Robin Murphy]

On 14/07/2023 6:46 pm, 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.

Thanks Rob; FWIW,

Acked-by: Robin Murphy <robin.murphy@xxxxxxx>

I guess you're hoping for Joerg to pick this up? However I wouldn't 
foresee any major conflicts if you do need to take it through the OF tree.

Cheers,
Robin.

> Signed-off-by: Rob Herring <robh@xxxxxxxxxx>
> ---
>   drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 2 +-
>   drivers/iommu/arm/arm-smmu/arm-smmu.c            | 1 -
>   drivers/iommu/arm/arm-smmu/qcom_iommu.c          | 3 +--
>   drivers/iommu/ipmmu-vmsa.c                       | 1 -
>   drivers/iommu/sprd-iommu.c                       | 1 +
>   drivers/iommu/tegra-smmu.c                       | 2 +-
>   drivers/iommu/virtio-iommu.c                     | 2 +-
>   7 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
> index b5b14108e086..bb89d49adf8d 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c
> @@ -3,7 +3,7 @@
>    * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
>    */
>   
> -#include <linux/of_device.h>
> +#include <linux/device.h>
>   #include <linux/firmware/qcom/qcom_scm.h>
>   #include <linux/ratelimit.h>
>   
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> index a86acd76c1df..d6d1a2a55cc0 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> @@ -29,7 +29,6 @@
>   #include <linux/module.h>
>   #include <linux/of.h>
>   #include <linux/of_address.h>
> -#include <linux/of_device.h>
>   #include <linux/pci.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm_runtime.h>
> diff --git a/drivers/iommu/arm/arm-smmu/qcom_iommu.c b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> index a503ed758ec3..cc3f68a3516c 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -22,8 +22,7 @@
>   #include <linux/init.h>
>   #include <linux/mutex.h>
>   #include <linux/of.h>
> -#include <linux/of_address.h>
> -#include <linux/of_device.h>
> +#include <linux/of_platform.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm.h>
>   #include <linux/pm_runtime.h>
> diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
> index 9f64c5c9f5b9..0aeedd3e1494 100644
> --- a/drivers/iommu/ipmmu-vmsa.c
> +++ b/drivers/iommu/ipmmu-vmsa.c
> @@ -17,7 +17,6 @@
>   #include <linux/io-pgtable.h>
>   #include <linux/iommu.h>
>   #include <linux/of.h>
> -#include <linux/of_device.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
>   #include <linux/sizes.h>
> diff --git a/drivers/iommu/sprd-iommu.c b/drivers/iommu/sprd-iommu.c
> index 39e34fdeccda..51144c232474 100644
> --- a/drivers/iommu/sprd-iommu.c
> +++ b/drivers/iommu/sprd-iommu.c
> @@ -14,6 +14,7 @@
>   #include <linux/mfd/syscon.h>
>   #include <linux/module.h>
>   #include <linux/of_platform.h>
> +#include <linux/platform_device.h>
>   #include <linux/regmap.h>
>   #include <linux/slab.h>
>   
> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
> index 1cbf063ccf14..e445f80d0226 100644
> --- a/drivers/iommu/tegra-smmu.c
> +++ b/drivers/iommu/tegra-smmu.c
> @@ -9,7 +9,7 @@
>   #include <linux/iommu.h>
>   #include <linux/kernel.h>
>   #include <linux/of.h>
> -#include <linux/of_device.h>
> +#include <linux/of_platform.h>
>   #include <linux/pci.h>
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
> diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
> index 3551ed057774..17dcd826f5c2 100644
> --- a/drivers/iommu/virtio-iommu.c
> +++ b/drivers/iommu/virtio-iommu.c
> @@ -13,7 +13,7 @@
>   #include <linux/interval_tree.h>
>   #include <linux/iommu.h>
>   #include <linux/module.h>
> -#include <linux/of_platform.h>
> +#include <linux/of.h>
>   #include <linux/pci.h>
>   #include <linux/virtio.h>
>   #include <linux/virtio_config.h>