Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 797cfc4f authored by Sinan Kaya's avatar Sinan Kaya Committed by Matt Turner
Browse files

alpha: 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: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 84e45536

arch/alpha/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn) 
		if (bus == 0 && dfn == 0) {

			hose = pci_isa_hose;

		} else {

			dev = pci_get_bus_and_slot(bus, dfn);

			dev = pci_get_domain_bus_and_slot(0, bus, dfn);

			if (!dev)

				return -ENODEV;

			hose = dev->sysdata;

arch/alpha/kernel/sys_nautilus.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ nautilus_init_pci(void) 
	bus = hose->bus = bridge->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->resource[0] = &irongate_io;

	bus->resource[1] = &irongate_mem;