[PATCH] alpha: switch to pci_get API
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 <alan@redhat.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
3869aa292f
commit
074cec54d1
|
@ -516,10 +516,11 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
|
||||||
if (bus == 0 && dfn == 0) {
|
if (bus == 0 && dfn == 0) {
|
||||||
hose = pci_isa_hose;
|
hose = pci_isa_hose;
|
||||||
} else {
|
} else {
|
||||||
dev = pci_find_slot(bus, dfn);
|
dev = pci_get_bus_and_slot(bus, dfn);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
hose = dev->sysdata;
|
hose = dev->sysdata;
|
||||||
|
pci_dev_put(dev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -183,11 +183,15 @@ miata_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
|
||||||
|
|
||||||
if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
|
if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
|
||||||
u8 irq=0;
|
u8 irq=0;
|
||||||
|
struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);
|
||||||
if(pci_read_config_byte(pci_find_slot(dev->bus->number, dev->devfn & ~(7)), 0x40,&irq)!=PCIBIOS_SUCCESSFUL)
|
if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) {
|
||||||
|
pci_dev_put(pdev);
|
||||||
return -1;
|
return -1;
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
|
pci_dev_put(pdev);
|
||||||
return irq;
|
return irq;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return COMMON_TABLE_LOOKUP;
|
return COMMON_TABLE_LOOKUP;
|
||||||
|
|
|
@ -200,7 +200,7 @@ nautilus_init_pci(void)
|
||||||
bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
|
bus = pci_scan_bus(0, alpha_mv.pci_ops, hose);
|
||||||
hose->bus = bus;
|
hose->bus = bus;
|
||||||
|
|
||||||
irongate = pci_find_slot(0, 0);
|
irongate = pci_get_bus_and_slot(0, 0);
|
||||||
bus->self = irongate;
|
bus->self = irongate;
|
||||||
bus->resource[1] = &irongate_mem;
|
bus->resource[1] = &irongate_mem;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue