From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sun, 9 Mar 2014 21:03:28 +0000 (-0700)
Subject: iommu/vt-d: Make identity_mapping() take struct device not struct pci_dev
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9b226624bbf7102cee67b6459bcb9c66dd081ca7;p=deliverable%2Flinux.git

iommu/vt-d: Make identity_mapping() take struct device not struct pci_dev

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 5c89eb7ae398..1030230d4851 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -2439,14 +2439,14 @@ static int __init si_domain_init(int hw)
 	return 0;
 }
 
-static int identity_mapping(struct pci_dev *pdev)
+static int identity_mapping(struct device *dev)
 {
 	struct device_domain_info *info;
 
 	if (likely(!iommu_identity_mapping))
 		return 0;
 
-	info = pdev->dev.archdata.iommu;
+	info = dev->archdata.iommu;
 	if (info && info != DUMMY_DEVICE_DOMAIN_INFO)
 		return (info->domain == si_domain);
 
@@ -2903,7 +2903,7 @@ static int iommu_no_mapping(struct device *dev)
 		return 0;
 
 	pdev = to_pci_dev(dev);
-	found = identity_mapping(pdev);
+	found = identity_mapping(dev);
 	if (found) {
 		if (iommu_should_identity_map(pdev, 0))
 			return 1;