aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2018-01-11 17:25:15 -0600
committerBjorn Helgaas <helgaas@kernel.org>2018-01-11 17:25:15 -0600
commit067ddab5446037acb778c102e6e599da4302c5e2 (patch)
treee5a5f653d0f94d2a97d9968f8d52abe4ccdef820 /drivers/char
parentagp: nvidia: Deprecate pci_get_bus_and_slot() (diff)
downloadlinux-dev-067ddab5446037acb778c102e6e599da4302c5e2.tar.xz
linux-dev-067ddab5446037acb778c102e6e599da4302c5e2.zip
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/sworks-agp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index 03be4ac79b0d..4dbdd3bc9bb8 100644
--- 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");