Skip to content

Commit e7747d8

Browse files
rmurphy-armjoergroedel
authored andcommitted
iommu/ipmmu-vmsa: Remove redundant of_iommu_init_fn hook
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 <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent 892d7aa commit e7747d8

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

drivers/iommu/ipmmu-vmsa.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,18 +1108,8 @@ static void __exit ipmmu_exit(void)
11081108
subsys_initcall(ipmmu_init);
11091109
module_exit(ipmmu_exit);
11101110

1111-
#ifdef CONFIG_IOMMU_DMA
1112-
static int __init ipmmu_vmsa_iommu_of_setup(struct device_node *np)
1113-
{
1114-
ipmmu_init();
1115-
return 0;
1116-
}
1117-
1118-
IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa",
1119-
ipmmu_vmsa_iommu_of_setup);
1120-
IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795",
1121-
ipmmu_vmsa_iommu_of_setup);
1122-
#endif
1111+
IOMMU_OF_DECLARE(ipmmu_vmsa_iommu_of, "renesas,ipmmu-vmsa", NULL);
1112+
IOMMU_OF_DECLARE(ipmmu_r8a7795_iommu_of, "renesas,ipmmu-r8a7795", NULL);
11231113

11241114
MODULE_DESCRIPTION("IOMMU API for Renesas VMSA-compatible IPMMU");
11251115
MODULE_AUTHOR("Laurent Pinchart <[email protected]>");

0 commit comments

Comments
 (0)