Commit ac6bbf0c authored by Rob Herring's avatar Rob Herring Committed by Greg Kroah-Hartman
Browse files

iommu: Remove IOMMU_OF_DECLARE 



Now that we use the driver core to stop deferred probe for missing
drivers, IOMMU_OF_DECLARE can be removed.

This is slightly less optimal than having a list of built-in drivers in
that we'll now defer probe twice before giving up. This shouldn't have a
significant impact on boot times as past discussions about deferred
probe have given no evidence of deferred probe having a substantial
impact.

Cc: Robin Murphy <robin.murphy@arm.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: iommu@lists.linux-foundation.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-rockchip@lists.infradead.org
Cc: devicetree@vger.kernel.org
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78f307be

drivers/iommu/arm-smmu-v3.c

+0 −2
Original line number Diff line number Diff line
@@ -2915,8 +2915,6 @@ static struct platform_driver arm_smmu_driver = { 
};

module_platform_driver(arm_smmu_driver);



IOMMU_OF_DECLARE(arm_smmuv3, "arm,smmu-v3");



MODULE_DESCRIPTION("IOMMU API for ARM architected SMMUv3 implementations");

MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

MODULE_LICENSE("GPL v2");

drivers/iommu/arm-smmu.c

+0 −7
Original line number Diff line number Diff line
@@ -2211,13 +2211,6 @@ static struct platform_driver arm_smmu_driver = { 
};

module_platform_driver(arm_smmu_driver);



IOMMU_OF_DECLARE(arm_smmuv1, "arm,smmu-v1");

IOMMU_OF_DECLARE(arm_smmuv2, "arm,smmu-v2");

IOMMU_OF_DECLARE(arm_mmu400, "arm,mmu-400");

IOMMU_OF_DECLARE(arm_mmu401, "arm,mmu-401");

IOMMU_OF_DECLARE(arm_mmu500, "arm,mmu-500");

IOMMU_OF_DECLARE(cavium_smmuv2, "cavium,smmu-v2");



MODULE_DESCRIPTION("IOMMU API for ARM architected SMMU implementations");

MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");

MODULE_LICENSE("GPL v2");

drivers/iommu/exynos-iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -1390,5 +1390,3 @@ err_reg_driver: 
	return ret;

}

core_initcall(exynos_iommu_init);
 


IOMMU_OF_DECLARE(exynos_iommu_of, "samsung,exynos-sysmmu");

drivers/iommu/ipmmu-vmsa.c

+0 −3
Original line number Diff line number Diff line
@@ -1108,9 +1108,6 @@ static void __exit ipmmu_exit(void) 
subsys_initcall(ipmmu_init);

module_exit(ipmmu_exit);



IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa");

IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795");



MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");

MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");

MODULE_LICENSE("GPL v2");

drivers/iommu/msm_iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -877,7 +877,5 @@ static void __exit msm_iommu_driver_exit(void) 
subsys_initcall(msm_iommu_driver_init);

module_exit(msm_iommu_driver_exit);



IOMMU_OF_DECLARE(msm_iommu_of, "qcom,apq8064-iommu");



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Stepan Moskovchenko <stepanm@codeaurora.org>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE