pch_gbe: 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 the domain information from pdev while calling into
pci_get_domain_bus_and_slot() function.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <helgaas@kernel.org>
Acked-by: David S. Miller <davem@davemloft.net>

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 40e52ffb732f4fc9f9a10b9444e8c4b2d2722e87..7cd494611a74027a9b2867dabc9073c1d1235662 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -2594,8 +2594,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));
+       adapter->ptp_pdev =
+               pci_get_domain_bus_and_slot(pci_domain_nr(adapter->pdev->bus),
+                                           adapter->pdev->bus->number,
+                                           PCI_DEVFN(12, 4));
 
        netdev->netdev_ops = &pch_gbe_netdev_ops;
        netdev->watchdog_timeo = PCH_GBE_WATCHDOG_PERIOD;