summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/intel-iommu.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2014-03-09 22:03:28 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2014-03-24 15:07:48 +0100
commit9b226624bbf7102cee67b6459bcb9c66dd081ca7 (patch)
treee7ebcdd1bc82520857f7e7876962ef19906900b6 /drivers/iommu/intel-iommu.c
parentiommu/vt-d: Remove segment from struct device_domain_info() (diff)
downloadlinux-9b226624bbf7102cee67b6459bcb9c66dd081ca7.tar.xz
linux-9b226624bbf7102cee67b6459bcb9c66dd081ca7.zip
iommu/vt-d: Make identity_mapping() take struct device not struct pci_dev
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
-rw-r--r--drivers/iommu/intel-iommu.c6
1 files changed, 3 insertions, 3 deletions
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;