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

iommu/vt-d: Use bus_set_iommu instead of register_iommu

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

Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index c621c98c99da..2d53c3df12dc 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3486,7 +3486,7 @@ int __init intel_iommu_init(void)
 
 	init_iommu_pm_ops();
 
-	register_iommu(&intel_iommu_ops);
+	bus_set_iommu(&pci_bus_type, &intel_iommu_ops);
 
 	bus_register_notifier(&pci_bus_type, &device_nb);