evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] x86: remove last two pci_find offenders in the core code

Browse source 
Resending as I believe the discussion about them established they were
correct.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
This commit is contained in:
Alan Cox 2006-12-07 02:14:03 +01:00 • committed by Andi Kleen
parent 72690a2118
commit 7cd8b6861e
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/i386/pci/irq.c
View file

@ -764,7 +764,7 @@ static void __init pirq_find_router(struct irq_router *r)
DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
rt->rtr_vendor, rt->rtr_device); 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) { if (!pirq_router_dev) {
DBG(KERN_DEBUG "PCI: Interrupt router not found at " DBG(KERN_DEBUG "PCI: Interrupt router not found at "
"%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn); "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
@ -784,6 +784,8 @@ static void __init pirq_find_router(struct irq_router *r)
pirq_router_dev->vendor, pirq_router_dev->vendor,
pirq_router_dev->device, pirq_router_dev->device,
pci_name(pirq_router_dev)); pci_name(pirq_router_dev));
/* The device remains referenced for the kernel lifetime */
} }
static struct irq_info *pirq_get_info(struct pci_dev *dev) static struct irq_info *pirq_get_info(struct pci_dev *dev)

2
arch/x86_64/kernel/pci-calgary.c
View file

@ -921,7 +921,7 @@ static int __init calgary_init(void)
error: error:
do { do {
dev = pci_find_device_reverse(PCI_VENDOR_ID_IBM, dev = pci_get_device_reverse(PCI_VENDOR_ID_IBM,
PCI_DEVICE_ID_IBM_CALGARY, PCI_DEVICE_ID_IBM_CALGARY,
dev); dev);
if (!dev) if (!dev)