aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/intel-iommu.c
diff options
context:
space:
mode:
authorStefan Assmann <sassmann@redhat.com>2009-12-03 06:49:24 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-12-16 16:37:53 -0500
commit45e829ea412760d2404d7dfc42528df46aedbf62 (patch)
tree869581b5828f9eb16a5ce38231b58a80a30be67c /drivers/pci/intel-iommu.c
parent5714868812b563ba8816c1d974f4f07c76941c30 (diff)
PCI: change PCI nomenclature in drivers/pci/ (comment changes)
Changing occurrences of variants of PCI-X and PCIe to the PCI-SIG terms listed in the "Trademark and Logo Usage Guidelines". http://www.pcisig.com/developers/procedures/logos/Trademark_and_Logo_Usage_Guidelines_updated_112206.pdf Patch is limited to drivers/pci/ and changes concern comments only. Signed-off-by: Stefan Assmann <sassmann@redhat.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/intel-iommu.c')
-rw-r--r--drivers/pci/intel-iommu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 8d6159426311..25e15d518bd9 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -304,7 +304,7 @@ struct device_domain_info {
304 int segment; /* PCI domain */ 304 int segment; /* PCI domain */
305 u8 bus; /* PCI bus number */ 305 u8 bus; /* PCI bus number */
306 u8 devfn; /* PCI devfn number */ 306 u8 devfn; /* PCI devfn number */
307 struct pci_dev *dev; /* it's NULL for PCIE-to-PCI bridge */ 307 struct pci_dev *dev; /* it's NULL for PCIe-to-PCI bridge */
308 struct intel_iommu *iommu; /* IOMMU used by this device */ 308 struct intel_iommu *iommu; /* IOMMU used by this device */
309 struct dmar_domain *domain; /* pointer to domain */ 309 struct dmar_domain *domain; /* pointer to domain */
310}; 310};
@@ -1611,7 +1611,7 @@ domain_context_mapping(struct dmar_domain *domain, struct pci_dev *pdev,
1611 return ret; 1611 return ret;
1612 parent = parent->bus->self; 1612 parent = parent->bus->self;
1613 } 1613 }
1614 if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */ 1614 if (pci_is_pcie(tmp)) /* this is a PCIe-to-PCI bridge */
1615 return domain_context_mapping_one(domain, 1615 return domain_context_mapping_one(domain,
1616 pci_domain_nr(tmp->subordinate), 1616 pci_domain_nr(tmp->subordinate),
1617 tmp->subordinate->number, 0, 1617 tmp->subordinate->number, 0,
@@ -3319,7 +3319,7 @@ static void iommu_detach_dependent_devices(struct intel_iommu *iommu,
3319 parent->devfn); 3319 parent->devfn);
3320 parent = parent->bus->self; 3320 parent = parent->bus->self;
3321 } 3321 }
3322 if (pci_is_pcie(tmp)) /* this is a PCIE-to-PCI bridge */ 3322 if (pci_is_pcie(tmp)) /* this is a PCIe-to-PCI bridge */
3323 iommu_detach_dev(iommu, 3323 iommu_detach_dev(iommu,
3324 tmp->subordinate->number, 0); 3324 tmp->subordinate->number, 0);
3325 else /* this is a legacy PCI bridge */ 3325 else /* this is a legacy PCI bridge */