[PATCH 2/2] iommu: Drop unnecessary of_iommu.h includes

[Robin Murphy]

On 2021-05-27 20:37, Rob Herring wrote:
> The only place of_iommu.h is needed is in drivers/of/device.c. Remove it
> from everywhere else.

Of course, this was from the OF_IOMMU_DECLARE() business which is all is 
long gone now.

Reviewed-by: Robin Murphy <robin.murphy at arm.com>

> Cc: Will Deacon <will at kernel.org>
> Cc: Robin Murphy <robin.murphy at arm.com>
> Cc: Joerg Roedel <joro at 8bytes.org>
> Cc: Rob Clark <robdclark at gmail.com>
> Cc: Marek Szyprowski <m.szyprowski at samsung.com>
> Cc: Krzysztof Kozlowski <krzysztof.kozlowski at canonical.com>
> Cc: Bjorn Andersson <bjorn.andersson at linaro.org>
> Cc: Yong Wu <yong.wu at mediatek.com>
> Cc: Matthias Brugger <matthias.bgg at gmail.com>
> Cc: Heiko Stuebner <heiko at sntech.de>
> Cc: Jean-Philippe Brucker <jean-philippe at linaro.org>
> Cc: Frank Rowand <frowand.list at gmail.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: iommu at lists.linux-foundation.org
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---
>   drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 -
>   drivers/iommu/arm/arm-smmu/arm-smmu.c       | 1 -
>   drivers/iommu/arm/arm-smmu/qcom_iommu.c     | 1 -
>   drivers/iommu/exynos-iommu.c                | 1 -
>   drivers/iommu/ipmmu-vmsa.c                  | 1 -
>   drivers/iommu/msm_iommu.c                   | 1 -
>   drivers/iommu/mtk_iommu.c                   | 1 -
>   drivers/iommu/mtk_iommu_v1.c                | 1 -
>   drivers/iommu/omap-iommu.c                  | 1 -
>   drivers/iommu/rockchip-iommu.c              | 1 -
>   drivers/iommu/virtio-iommu.c                | 1 -
>   drivers/of/platform.c                       | 1 -
>   12 files changed, 12 deletions(-)
> 
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> index 54b2f27b81d4..2ddc3cd5a7d1 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> @@ -23,7 +23,6 @@
>   #include <linux/msi.h>
>   #include <linux/of.h>
>   #include <linux/of_address.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_platform.h>
>   #include <linux/pci.h>
>   #include <linux/pci-ats.h>
> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> index 6f72c4d208ca..dba15f312cbd 100644
> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
> @@ -31,7 +31,6 @@
>   #include <linux/of.h>
>   #include <linux/of_address.h>
>   #include <linux/of_device.h>
> -#include <linux/of_iommu.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 4294abe389b2..021cf8f65ffc 100644
> --- a/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> +++ b/drivers/iommu/arm/arm-smmu/qcom_iommu.c
> @@ -25,7 +25,6 @@
>   #include <linux/of.h>
>   #include <linux/of_address.h>
>   #include <linux/of_device.h>
> -#include <linux/of_iommu.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm.h>
>   #include <linux/pm_runtime.h>
> diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
> index 7623d8c371f5..d0fbf1d10e18 100644
> --- a/drivers/iommu/exynos-iommu.c
> +++ b/drivers/iommu/exynos-iommu.c
> @@ -17,7 +17,6 @@
>   #include <linux/kmemleak.h>
>   #include <linux/list.h>
>   #include <linux/of.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm_runtime.h>
> diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
> index aaa6a4d59057..51ea6f00db2f 100644
> --- a/drivers/iommu/ipmmu-vmsa.c
> +++ b/drivers/iommu/ipmmu-vmsa.c
> @@ -19,7 +19,6 @@
>   #include <linux/iommu.h>
>   #include <linux/of.h>
>   #include <linux/of_device.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
>   #include <linux/sizes.h>
> diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
> index 7880f307cb2d..3a38352b603f 100644
> --- a/drivers/iommu/msm_iommu.c
> +++ b/drivers/iommu/msm_iommu.c
> @@ -18,7 +18,6 @@
>   #include <linux/iommu.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> -#include <linux/of_iommu.h>
>   
>   #include <asm/cacheflush.h>
>   #include <linux/sizes.h>
> diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c
> index e06b8a0e2b56..6f7c69688ce2 100644
> --- a/drivers/iommu/mtk_iommu.c
> +++ b/drivers/iommu/mtk_iommu.c
> @@ -19,7 +19,6 @@
>   #include <linux/mfd/syscon.h>
>   #include <linux/module.h>
>   #include <linux/of_address.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c
> index 5915d7b38211..778e66f5f1aa 100644
> --- a/drivers/iommu/mtk_iommu_v1.c
> +++ b/drivers/iommu/mtk_iommu_v1.c
> @@ -22,7 +22,6 @@
>   #include <linux/list.h>
>   #include <linux/module.h>
>   #include <linux/of_address.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
> index 26e517eb0dd3..91749654fd49 100644
> --- a/drivers/iommu/omap-iommu.c
> +++ b/drivers/iommu/omap-iommu.c
> @@ -22,7 +22,6 @@
>   #include <linux/io.h>
>   #include <linux/pm_runtime.h>
>   #include <linux/of.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/regmap.h>
> diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
> index 7a2932772fdf..bb50e015b1d5 100644
> --- a/drivers/iommu/rockchip-iommu.c
> +++ b/drivers/iommu/rockchip-iommu.c
> @@ -21,7 +21,6 @@
>   #include <linux/mm.h>
>   #include <linux/init.h>
>   #include <linux/of.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm_runtime.h>
> diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
> index 7c02481a81b4..d9f46f2c3058 100644
> --- a/drivers/iommu/virtio-iommu.c
> +++ b/drivers/iommu/virtio-iommu.c
> @@ -14,7 +14,6 @@
>   #include <linux/interval_tree.h>
>   #include <linux/iommu.h>
>   #include <linux/module.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_platform.h>
>   #include <linux/pci.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/of/platform.c b/drivers/of/platform.c
> index 25d448f5af91..74afbb7a4f5e 100644
> --- a/drivers/of/platform.c
> +++ b/drivers/of/platform.c
> @@ -17,7 +17,6 @@
>   #include <linux/slab.h>
>   #include <linux/of_address.h>
>   #include <linux/of_device.h>
> -#include <linux/of_iommu.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
>