Merge tag 'pci-v5.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[linux-2.6-microblaze.git] / drivers / net / ethernet / stmicro / stmmac / stmmac_pci.c

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 26db6aa..7cbc01f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -208,7 +208,7 @@ static int quark_default_data(struct pci_dev *pdev,
                ret = 1;
        }
 
-       plat->bus_id = PCI_DEVID(pdev->bus->number, pdev->devfn);
+       plat->bus_id = pci_dev_id(pdev);
        plat->phy_addr = ret;
        plat->interface = PHY_INTERFACE_MODE_RMII;