From: Joerg Roedel <joerg.roedel@amd.com>
Date: Tue, 6 Sep 2011 15:56:07 +0000 (+0200)
Subject: iommu/amd: Use bus_set_iommu instead of register_iommu
X-Git-Tag: android-x86-4.4-r1~4547^2^5~4
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2cc21c4236f0d1fb67a30d87cfb0f49f185690a0;p=android-x86%2Fkernel.git

iommu/amd: Use bus_set_iommu instead of register_iommu

Convert the AMD IOMMU driver to use the new interface for
publishing the iommu_ops.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index a14f8dc23462..57f6f38ca4f6 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2493,7 +2493,7 @@ static unsigned device_dma_ops_init(void)
 
 void __init amd_iommu_init_api(void)
 {
-	register_iommu(&amd_iommu_ops);
+	bus_set_iommu(&pci_bus_type, &amd_iommu_ops);
 }
 
 int __init amd_iommu_init_dma_ops(void)