From: Alan Cox Now that we have pci_get_bus_and_slot we can do the job correctly. Note that some of these calls intentionally leak a device - this is because the device in question is always needed from boot to reboot. Signed-off-by: Alan Cox Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton --- arch/alpha/kernel/pci.c | 3 ++- arch/alpha/kernel/sys_miata.c | 10 +++++++--- arch/alpha/kernel/sys_nautilus.c | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff -puN arch/alpha/kernel/pci.c~alpha-switch-to-pci_get-api arch/alpha/kernel/pci.c --- a/arch/alpha/kernel/pci.c~alpha-switch-to-pci_get-api +++ a/arch/alpha/kernel/pci.c @@ -516,10 +516,11 @@ sys_pciconfig_iobase(long which, unsigne if (bus == 0 && dfn == 0) { hose = pci_isa_hose; } else { - dev = pci_find_slot(bus, dfn); + dev = pci_get_bus_and_slot(bus, dfn); if (!dev) return -ENODEV; hose = dev->sysdata; + pci_dev_put(dev); } } diff -puN arch/alpha/kernel/sys_miata.c~alpha-switch-to-pci_get-api arch/alpha/kernel/sys_miata.c --- a/arch/alpha/kernel/sys_miata.c~alpha-switch-to-pci_get-api +++ a/arch/alpha/kernel/sys_miata.c @@ -183,11 +183,15 @@ miata_map_irq(struct pci_dev *dev, u8 sl if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) { u8 irq=0; - - if(pci_read_config_byte(pci_find_slot(dev->bus->number, dev->devfn & ~(7)), 0x40,&irq)!=PCIBIOS_SUCCESSFUL) + struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7); + if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) { + pci_dev_put(pdev); return -1; - else + } + else { + pci_dev_put(pdev); return irq; + } } return COMMON_TABLE_LOOKUP; diff -puN arch/alpha/kernel/sys_nautilus.c~alpha-switch-to-pci_get-api arch/alpha/kernel/sys_nautilus.c --- a/arch/alpha/kernel/sys_nautilus.c~alpha-switch-to-pci_get-api +++ a/arch/alpha/kernel/sys_nautilus.c @@ -200,7 +200,7 @@ nautilus_init_pci(void) bus = pci_scan_bus(0, alpha_mv.pci_ops, hose); hose->bus = bus; - irongate = pci_find_slot(0, 0); + irongate = pci_get_bus_and_slot(0, 0); bus->self = irongate; bus->resource[1] = &irongate_mem; _