[PATCH 16/30] pch_gbe: deprecate pci_get_bus_and_slot()
From: Sinan Kaya <hidden>
Date: 2017-11-22 05:32:22
Also in:
linux-arm-msm, linux-pci, lkml, netdev
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
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: Sinan Kaya <redacted> --- drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 5ae9681..0df94ac 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c@@ -2560,6 +2560,7 @@ static int pch_gbe_probe(struct pci_dev *pdev, { struct net_device *netdev; struct pch_gbe_adapter *adapter; + int domainnr, busnr; int ret; ret = pcim_enable_device(pdev);
@@ -2603,8 +2604,10 @@ static int pch_gbe_probe(struct pci_dev *pdev, if (adapter->pdata && adapter->pdata->platform_init) adapter->pdata->platform_init(pdev); - adapter->ptp_pdev = pci_get_bus_and_slot(adapter->pdev->bus->number, - PCI_DEVFN(12, 4)); + domainnr = pci_domain_nr(adapter->pdev->bus); + busnr = adapter->pdev->bus->number + adapter->ptp_pdev = pci_get_domain_bus_and_slot(domainnr, busnr, + PCI_DEVFN(12, 4)); netdev->netdev_ops = &pch_gbe_netdev_ops; netdev->watchdog_timeo = PCH_GBE_WATCHDOG_PERIOD;
--
1.9.1