iommu/ipmmu-vmsa: Remove redundant of_iommu_init_fn hook (e7747d88) · Commits · 戴 / test

Having of_iommu_init() call ipmmu_init() via ipmmu_vmsa_iommu_of_setup() does nothing that the subsys_initcall wouldn't do slightly later anyway, since probe-deferral of masters means it is no longer critical to register the driver super-early. Clean it up. Signed-off-by:

Robin Murphy <robin.murphy@arm.com> Signed-off-by:

Joerg Roedel <jroedel@suse.de>

drivers/iommu/ipmmu-vmsa.c

+2 −12

Original line number	Diff line number	Diff line
		@@ -1108,18 +1108,8 @@ static void __exit ipmmu_exit(void)
		subsys_initcall(ipmmu_init);
		module_exit(ipmmu_exit);

		#ifdef CONFIG_IOMMU_DMA
		static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np)
		{
		ipmmu_init();
		return 0;
		}

		IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa",
		ipmmu_vmsa_iommu_of_setup);
		IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795",
		ipmmu_vmsa_iommu_of_setup);
		#endif
		IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", NULL);
		IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", NULL);

		MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");
		MODULE_AUTHOR("Laurent Pinchart <laurent.pinchart@ideasonboard.com>");

Admin message