diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2014-03-09 17:03:28 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2014-03-24 10:07:48 -0400 |
commit | 9b226624bbf7102cee67b6459bcb9c66dd081ca7 (patch) | |
tree | e7ebcdd1bc82520857f7e7876962ef19906900b6 /drivers/iommu | |
parent | 41e80dca52bd0497c1bb292713fc0164415e9ae6 (diff) |
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')
-rw-r--r-- | drivers/iommu/intel-iommu.c | 6 |
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) | |||
2439 | return 0; | 2439 | return 0; |
2440 | } | 2440 | } |
2441 | 2441 | ||
2442 | static int identity_mapping(struct pci_dev *pdev) | 2442 | static int identity_mapping(struct device *dev) |
2443 | { | 2443 | { |
2444 | struct device_domain_info *info; | 2444 | struct device_domain_info *info; |
2445 | 2445 | ||
2446 | if (likely(!iommu_identity_mapping)) | 2446 | if (likely(!iommu_identity_mapping)) |
2447 | return 0; | 2447 | return 0; |
2448 | 2448 | ||
2449 | info = pdev->dev.archdata.iommu; | 2449 | info = dev->archdata.iommu; |
2450 | if (info && info != DUMMY_DEVICE_DOMAIN_INFO) | 2450 | if (info && info != DUMMY_DEVICE_DOMAIN_INFO) |
2451 | return (info->domain == si_domain); | 2451 | return (info->domain == si_domain); |
2452 | 2452 | ||
@@ -2903,7 +2903,7 @@ static int iommu_no_mapping(struct device *dev) | |||
2903 | return 0; | 2903 | return 0; |
2904 | 2904 | ||
2905 | pdev = to_pci_dev(dev); | 2905 | pdev = to_pci_dev(dev); |
2906 | found = identity_mapping(pdev); | 2906 | found = identity_mapping(dev); |
2907 | if (found) { | 2907 | if (found) { |
2908 | if (iommu_should_identity_map(pdev, 0)) | 2908 | if (iommu_should_identity_map(pdev, 0)) |
2909 | return 1; | 2909 | return 1; |