From: Robin Murphy <robin.murphy@arm.com>
Date: Mon, 15 Aug 2022 16:20:14 +0000 (+0100)
Subject: iommu/omap: Clean up bus_set_iommu()
X-Git-Tag: v6.1-rc5~227^2^8~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a24090860e7dfaef096c69cc791db6b281246e88;p=platform%2Fkernel%2Flinux-starfive.git

iommu/omap: Clean up bus_set_iommu()

Stop calling bus_set_iommu() since it's now unnecessary, and simplify
the init failure path accordingly.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/b578af8e2bf8afeccb2c2ce87c1aa38b36f01331.1660572783.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index d9cf282..07ee260 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1776,14 +1776,8 @@ static int __init omap_iommu_init(void)
 		goto fail_driver;
 	}
 
-	ret = bus_set_iommu(&platform_bus_type, &omap_iommu_ops);
-	if (ret)
-		goto fail_bus;
-
 	return 0;
 
-fail_bus:
-	platform_driver_unregister(&omap_iommu_driver);
 fail_driver:
 	kmem_cache_destroy(iopte_cachep);
 	return ret;