From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 6 Sep 2011 15:56:07 +0000 (+0200)
Subject: iommu/omap: Use bus_set_iommu instead of register_iommu
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a65bc64f91623b9f7ef1fc7afa27e857c7b6e4a2;p=linux-beck.git

iommu/omap: Use bus_set_iommu instead of register_iommu

Convert the OMAP IOMMU driver on ARM to use the new
interface for publishing the iommu_ops.

Cc: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---

diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index bd5f6064c74a..16d5b76fb449 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1250,7 +1250,7 @@ static int __init omap_iommu_init(void)
 		return -ENOMEM;
 	iopte_cachep = p;
 
-	register_iommu(&omap_iommu_ops);
+	bus_set_iommu(&platform_bus_type, &omap_iommu_ops);
 
 	return platform_driver_register(&omap_iommu_driver);
 }