Commit 84f8cbf7 authored by Sinan Kaya's avatar Sinan Kaya Committed by Bjorn Helgaas
Browse files

agp: nvidia: 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().

Replace pci_get_bus_and_slot() with pci_get_domain_bus_and_slot()
and extract the domain number from struct pci_dev.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <helgaas@kernel.org>
parent 78a6b8d8

drivers/char/agp/nvidia-agp.c

+9 −3
Original line number Diff line number Diff line
@@ -340,11 +340,17 @@ static int agp_nvidia_probe(struct pci_dev *pdev, 
	u8 cap_ptr;



	nvidia_private.dev_1 =

		pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 1));

		pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus),

					    (unsigned int)pdev->bus->number,

					    PCI_DEVFN(0, 1));

	nvidia_private.dev_2 =

		pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(0, 2));

		pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus),

					    (unsigned int)pdev->bus->number,

					    PCI_DEVFN(0, 2));

	nvidia_private.dev_3 =

		pci_get_bus_and_slot((unsigned int)pdev->bus->number, PCI_DEVFN(30, 0));

		pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus),

					    (unsigned int)pdev->bus->number,

					    PCI_DEVFN(30, 0));



	if (!nvidia_private.dev_1 || !nvidia_private.dev_2 || !nvidia_private.dev_3) {

		printk(KERN_INFO PFX "Detected an NVIDIA nForce/nForce2 "