x86: pci: Use DM PCI APIs in pci_assign_irqs()

Drop legacy PCI APIs usage in pci_assign_irqs() as well.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c
index 7a31260..9cad57e 100644 (file)
--- a/arch/x86/cpu/pci.c
+++ b/arch/x86/cpu/pci.c
@@ -119,11 +119,11 @@ void pci_assign_irqs(int bus, int device, u8 irq[4])
 
        for (func = 0; func < 8; func++) {
                bdf = PCI_BDF(bus, device, func);
-               vendor = x86_pci_read_config16(bdf, PCI_VENDOR_ID);
+               pci_read_config16(bdf, PCI_VENDOR_ID, &vendor);
                if (vendor == 0xffff || vendor == 0x0000)
                        continue;
 
-               pin = x86_pci_read_config8(bdf, PCI_INTERRUPT_PIN);
+               pci_read_config8(bdf, PCI_INTERRUPT_PIN, &pin);
 
                /* PCI spec says all values except 1..4 are reserved */
                if ((pin < 1) || (pin > 4))
@@ -136,6 +136,6 @@ void pci_assign_irqs(int bus, int device, u8 irq[4])
                debug("Assigning IRQ %d to PCI device %d.%x.%d (INT%c)\n",
                      line, bus, device, func, 'A' + pin - 1);
 
-               x86_pci_write_config8(bdf, PCI_INTERRUPT_LINE, line);
+               pci_write_config8(bdf, PCI_INTERRUPT_LINE, line);
        }
 }