summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 00:35:54 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-04-13 00:35:54 +0200
commit9a9ca16e7a36a9daa93f6d2cf912170091d91ed6 (patch)
treee3c8abf8249d8f6967679510132943454bc19fc6 /drivers/iommu
parent34a1b99b9b4d81b0d835c08239c1180e83703bb7 (diff)
parent16ba08d5c9ec44f89ec03c67ecf7a9c5e2d204fd (diff)
downloadlinux-9a9ca16e7a36a9daa93f6d2cf912170091d91ed6.tar.bz2
Merge branch 'device-properties'
* device-properties: device property: Introduce firmware node type for platform data device property: Make it possible to use secondary firmware nodes driver core: Implement device property accessors through fwnode ones driver core: property: Update fwnode_property_read_string_array() driver core: Add comments about returning array counts ACPI: Introduce has_acpi_companion() driver core / ACPI: Represent ACPI companions using fwnode_handle
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/intel-iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 2d1e05bdbb53..4fc1f8a7f98e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -684,7 +684,7 @@ static struct intel_iommu *device_to_iommu(struct device *dev, u8 *bus, u8 *devf
if (dev_is_pci(dev)) {
pdev = to_pci_dev(dev);
segment = pci_domain_nr(pdev->bus);
- } else if (ACPI_COMPANION(dev))
+ } else if (has_acpi_companion(dev))
dev = &ACPI_COMPANION(dev)->dev;
rcu_read_lock();