x86: resend - remove last two pci_find offenders in the core code
PATCH 1/1 x86: resend - remove last two pci_find offenders in the core code
Resending as I believe the discussion about them established they were correct.
Signed-off-by Alan Cox <[email protected]>
arch/i386/pci/irq.c +3 -1
@@ -758,7 +758,7 @@DBG (KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n" , rt->rtr_vendor, rt->rtr_device); - pirq_router_dev =pci_find_slot (rt->rtr_bus, rt->rtr_devfn); + pirq_router_dev =pci_get_bus_and_slot (rt->rtr_bus, rt->rtr_devfn);if (!pirq_router_dev) {DBG (KERN_DEBUG "PCI: Interrupt router not found at " "%02x:%02x\n" , rt->rtr_bus, rt->rtr_devfn);
@@ -778,6 +778,8 @@ pirq_router_dev->vendor, pirq_router_dev->device, pci_name(pirq_router_dev)); + +/* The device remains referenced for the kernel lifetime */ }static struct irq_info *pirq_get_info (struct pci_dev *dev)
arch/x86_64/kernel/pci-calgary.c +1 -1
@@ -879,7 +879,7 @@ error: do { - dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM, + dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CALGARY, dev); if (!dev)