| Message ID | 1454319658-17431-23-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | 58316f9b9f1061f988b91ee49c69370eead7d8ca |
| Delegated to: | Bin Meng |
| Headers | show |
On 1 February 2016 at 02:40, Bin Meng <bmeng.cn@gmail.com> wrote: > Drop legacy PCI APIs usage in pci_assign_irqs() as well. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > arch/x86/cpu/pci.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Tested on Minnowmax: Tested-by: Simon Glass <sjg@chromium.org>
On Tue, Feb 2, 2016 at 12:20 AM, Simon Glass <sjg@chromium.org> wrote: > On 1 February 2016 at 02:40, Bin Meng <bmeng.cn@gmail.com> wrote: >> Drop legacy PCI APIs usage in pci_assign_irqs() as well. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- >> >> arch/x86/cpu/pci.c | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> > Tested on Minnowmax: > Tested-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86/master, thanks!
diff --git a/arch/x86/cpu/pci.c b/arch/x86/cpu/pci.c index 7a31260..9cad57e 100644 --- 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); } }
Drop legacy PCI APIs usage in pci_assign_irqs() as well. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- arch/x86/cpu/pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)