From: Zheng Zengkai Date: Fri, 11 Aug 2023 11:07:02 +0000 (+0800) Subject: net: ngbe: use pci_dev_id() to simplify the code X-Git-Tag: v6.6.17~4098^2~131^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf9b107f5fdddcd73b77169c30949d5e12e56eae;p=platform%2Fkernel%2Flinux-rpi.git net: ngbe: use pci_dev_id() to simplify the code PCI core API pci_dev_id() can be used to get the BDF number for a pci device. We don't need to compose it manually. Use pci_dev_id() to simplify the code a little bit. Signed-off-by: Zheng Zengkai Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c index cc2f325..fe20f02 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c @@ -266,8 +266,7 @@ int ngbe_mdio_init(struct wx *wx) mii_bus->write_c45 = ngbe_phy_write_reg_mdi_c45; } - snprintf(mii_bus->id, MII_BUS_ID_SIZE, "ngbe-%x", - (pdev->bus->number << 8) | pdev->devfn); + snprintf(mii_bus->id, MII_BUS_ID_SIZE, "ngbe-%x", pci_dev_id(pdev)); ret = devm_mdiobus_register(&pdev->dev, mii_bus); if (ret) return ret;