Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-block.git] / drivers / iommu / dmar.c

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 785675a56a10f8117b052ff06bf4e9b462e720b5..8b452c9676d968ca5650b1ad8ce2128571014ba8 100644 (file)
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -88,7 +88,7 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope,
                        pr_warn("Device scope bus [%d] not found\n", scope->bus);
                        break;
                }
-               pdev = pci_get_slot(bus, PCI_DEVFN(path->dev, path->fn));
+               pdev = pci_get_slot(bus, PCI_DEVFN(path->device, path->function));
                if (!pdev) {
                        /* warning will be printed below */
                        break;
@@ -99,7 +99,7 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope,
        }
        if (!pdev) {
                pr_warn("Device scope device [%04x:%02x:%02x.%02x] not found\n",
-                       segment, scope->bus, path->dev, path->fn);
+                       segment, scope->bus, path->device, path->function);
                *dev = NULL;
                return 0;
        }
@@ -403,7 +403,7 @@ dmar_find_matched_drhd_unit(struct pci_dev *dev)
 
        dev = pci_physfn(dev);
 
-       list_for_each_entry(dmaru, &dmar_drhd_units, list) {
+       for_each_drhd_unit(dmaru) {
                drhd = container_of(dmaru->hdr,
                                    struct acpi_dmar_hardware_unit,
                                    header);