Commit 50ed5780 authored by Sinan Kaya's avatar Sinan Kaya Committed by Bjorn Helgaas
Browse files

powerpc/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.

Getting ready to remove pci_get_bus_and_slot() function in favor of
pci_get_domain_bus_and_slot().

Use pci_get_domain_bus_and_slot() with a domain number of 0 as the code
is not ready to consume multiple domains and existing code used domain
number 0.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <helgaas@kernel.org>
Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent c98e54c8

arch/powerpc/kernel/pci_32.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,8 @@ make_one_node_map(struct device_node* node, u8 pci_bus) 
		reg = of_get_property(node, "reg", NULL);

		if (!reg)

			continue;

		dev = pci_get_bus_and_slot(pci_bus, ((reg[0] >> 8) & 0xff));

		dev = pci_get_domain_bus_and_slot(0, pci_bus,

						  ((reg[0] >> 8) & 0xff));

		if (!dev || !dev->subordinate) {

			pci_dev_put(dev);

			continue;

arch/powerpc/platforms/powermac/feature.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ core99_ata100_enable(struct device_node *node, long value) 


	if (value) {

		if (pci_device_from_OF_node(node, &pbus, &pid) == 0)

			pdev = pci_get_bus_and_slot(pbus, pid);

			pdev = pci_get_domain_bus_and_slot(0, pbus, pid);

		if (pdev == NULL)

			return 0;

		rc = pci_enable_device(pdev);

arch/powerpc/sysdev/mv64x60_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static ssize_t mv64x60_hs_reg_read(struct file *filp, struct kobject *kobj, 
	if (count < MV64X60_VAL_LEN_MAX)

		return -EINVAL;



	phb = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));

	phb = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));

	if (!phb)

		return -ENODEV;

	pci_read_config_dword(phb, MV64X60_PCICFG_CPCI_HOTSWAP, &v);
@@ -61,7 +61,7 @@ static ssize_t mv64x60_hs_reg_write(struct file *filp, struct kobject *kobj, 
	if (sscanf(buf, "%i", &v) != 1)

		return -EINVAL;



	phb = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));

	phb = pci_get_domain_bus_and_slot(0, 0, PCI_DEVFN(0, 0));

	if (!phb)

		return -ENODEV;

	pci_write_config_dword(phb, MV64X60_PCICFG_CPCI_HOTSWAP, v);