diff options
Diffstat (limited to 'drivers/iommu/intel_irq_remapping.c')
-rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index f71673dbb23d..ab86902fd9ff 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c | |||
@@ -686,12 +686,12 @@ static void ir_parse_one_hpet_scope(struct acpi_dmar_device_scope *scope, | |||
686 | * Access PCI directly due to the PCI | 686 | * Access PCI directly due to the PCI |
687 | * subsystem isn't initialized yet. | 687 | * subsystem isn't initialized yet. |
688 | */ | 688 | */ |
689 | bus = read_pci_config_byte(bus, path->dev, path->fn, | 689 | bus = read_pci_config_byte(bus, path->device, path->function, |
690 | PCI_SECONDARY_BUS); | 690 | PCI_SECONDARY_BUS); |
691 | path++; | 691 | path++; |
692 | } | 692 | } |
693 | ir_hpet[ir_hpet_num].bus = bus; | 693 | ir_hpet[ir_hpet_num].bus = bus; |
694 | ir_hpet[ir_hpet_num].devfn = PCI_DEVFN(path->dev, path->fn); | 694 | ir_hpet[ir_hpet_num].devfn = PCI_DEVFN(path->device, path->function); |
695 | ir_hpet[ir_hpet_num].iommu = iommu; | 695 | ir_hpet[ir_hpet_num].iommu = iommu; |
696 | ir_hpet[ir_hpet_num].id = scope->enumeration_id; | 696 | ir_hpet[ir_hpet_num].id = scope->enumeration_id; |
697 | ir_hpet_num++; | 697 | ir_hpet_num++; |
@@ -714,13 +714,13 @@ static void ir_parse_one_ioapic_scope(struct acpi_dmar_device_scope *scope, | |||
714 | * Access PCI directly due to the PCI | 714 | * Access PCI directly due to the PCI |
715 | * subsystem isn't initialized yet. | 715 | * subsystem isn't initialized yet. |
716 | */ | 716 | */ |
717 | bus = read_pci_config_byte(bus, path->dev, path->fn, | 717 | bus = read_pci_config_byte(bus, path->device, path->function, |
718 | PCI_SECONDARY_BUS); | 718 | PCI_SECONDARY_BUS); |
719 | path++; | 719 | path++; |
720 | } | 720 | } |
721 | 721 | ||
722 | ir_ioapic[ir_ioapic_num].bus = bus; | 722 | ir_ioapic[ir_ioapic_num].bus = bus; |
723 | ir_ioapic[ir_ioapic_num].devfn = PCI_DEVFN(path->dev, path->fn); | 723 | ir_ioapic[ir_ioapic_num].devfn = PCI_DEVFN(path->device, path->function); |
724 | ir_ioapic[ir_ioapic_num].iommu = iommu; | 724 | ir_ioapic[ir_ioapic_num].iommu = iommu; |
725 | ir_ioapic[ir_ioapic_num].id = scope->enumeration_id; | 725 | ir_ioapic[ir_ioapic_num].id = scope->enumeration_id; |
726 | ir_ioapic_num++; | 726 | ir_ioapic_num++; |