agp: sworks: 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: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>

diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 03be4ac79b0dfb7d8281bddc0b382e848a3c24f4..4dbdd3bc9bb8855e6e557abaac0aefe5feb0eb5c 100644 (file)
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -474,7 +474,8 @@ static int agp_serverworks_probe(struct pci_dev *pdev,
        }
 
        /* Everything is on func 1 here so we are hardcoding function one */
-       bridge_dev = pci_get_bus_and_slot((unsigned int)pdev->bus->number,
+       bridge_dev = pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus),
+                       (unsigned int)pdev->bus->number,
                        PCI_DEVFN(0, 1));
        if (!bridge_dev) {
                dev_info(&pdev->dev, "can't find secondary device\n");