hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

alpha/PCI: Deprecate pci_get_bus_and_slot() 

pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as
where a PCI device is present. This restricts the device drivers to be
reused for other domain numbers.

Use pci_get_domain_bus_and_slot() with a domain number of 0 where we can't
extract the domain number. Other places, use the actual domain number from
the device.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
This commit is contained in:
Sinan Kaya 2017-12-19 00:37:37 -05:00 committed by Bjorn Helgaas
parent 1291a0d504
commit c98e54c873
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/alpha/kernel/pci.c
View File

@ -425,7 +425,7 @@ 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_get_bus_and_slot(bus, dfn); dev = pci_get_domain_bus_and_slot(0, bus, dfn);
if (!dev) if (!dev)
return -ENODEV; return -ENODEV;
hose = dev->sysdata; hose = dev->sysdata;

2
arch/alpha/kernel/sys_nautilus.c
View File

@ -237,7 +237,7 @@ nautilus_init_pci(void)
bus = hose->bus = bridge->bus; bus = hose->bus = bridge->bus;
pcibios_claim_one_bus(bus); pcibios_claim_one_bus(bus);
irongate = pci_get_bus_and_slot(0, 0); irongate = pci_get_domain_bus_and_slot(pci_domain_nr(bus), 0, 0);
bus->self = irongate; bus->self = irongate;
bus->resource[0] = &irongate_io; bus->resource[0] = &irongate_io;
bus->resource[1] = &irongate_mem; bus->resource[1] = &irongate_mem;