Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-pci_dev_id'
Zheng Zengkai says:
====================
net: 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. Use the API to simplify the code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
+5
-10
+1
-2
drivers/net/ethernet/agere/et131x.c
+1
-2
drivers/net/ethernet/agere/et131x.c
···
3982
3982
}
3983
3983
3984
3984
adapter->mii_bus->name = "et131x_eth_mii";
3985
-
snprintf(adapter->mii_bus->id, MII_BUS_ID_SIZE, "%x",
3986
-
(adapter->pdev->bus->number << 8) | adapter->pdev->devfn);
3985
+
snprintf(adapter->mii_bus->id, MII_BUS_ID_SIZE, "%x", pci_dev_id(adapter->pdev));
3987
3986
adapter->mii_bus->priv = netdev;
3988
3987
adapter->mii_bus->read = et131x_mdio_read;
3989
3988
adapter->mii_bus->write = et131x_mdio_write;
+1
-2
drivers/net/ethernet/broadcom/tg3.c
+1
-2
drivers/net/ethernet/broadcom/tg3.c
···
1539
1539
return -ENOMEM;
1540
1540
1541
1541
tp->mdio_bus->name = "tg3 mdio bus";
1542
-
snprintf(tp->mdio_bus->id, MII_BUS_ID_SIZE, "%x",
1543
-
(tp->pdev->bus->number << 8) | tp->pdev->devfn);
1542
+
snprintf(tp->mdio_bus->id, MII_BUS_ID_SIZE, "%x", pci_dev_id(tp->pdev));
1544
1543
tp->mdio_bus->priv = tp;
1545
1544
tp->mdio_bus->parent = &tp->pdev->dev;
1546
1545
tp->mdio_bus->read = &tg3_mdio_read;
+1
-2
drivers/net/ethernet/smsc/smsc9420.c
+1
-2
drivers/net/ethernet/smsc/smsc9420.c
···
1144
1144
goto err_out_1;
1145
1145
}
1146
1146
pd->mii_bus->name = DRV_MDIONAME;
1147
-
snprintf(pd->mii_bus->id, MII_BUS_ID_SIZE, "%x",
1148
-
(pd->pdev->bus->number << 8) | pd->pdev->devfn);
1147
+
snprintf(pd->mii_bus->id, MII_BUS_ID_SIZE, "%x", pci_dev_id(pd->pdev));
1149
1148
pd->mii_bus->priv = pd;
1150
1149
pd->mii_bus->read = smsc9420_mii_read;
1151
1150
pd->mii_bus->write = smsc9420_mii_write;
+1
-2
drivers/net/ethernet/toshiba/tc35815.c
+1
-2
drivers/net/ethernet/toshiba/tc35815.c
···
667
667
lp->mii_bus->name = "tc35815_mii_bus";
668
668
lp->mii_bus->read = tc_mdio_read;
669
669
lp->mii_bus->write = tc_mdio_write;
670
-
snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%x",
671
-
(lp->pci_dev->bus->number << 8) | lp->pci_dev->devfn);
670
+
snprintf(lp->mii_bus->id, MII_BUS_ID_SIZE, "%x", pci_dev_id(lp->pci_dev));
672
671
lp->mii_bus->priv = dev;
673
672
lp->mii_bus->parent = &lp->pci_dev->dev;
674
673
err = mdiobus_register(lp->mii_bus);
+1
-2
drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
+1
-2
drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c
···
266
266
mii_bus->write_c45 = ngbe_phy_write_reg_mdi_c45;
267
267
}
268
268
269
-
snprintf(mii_bus->id, MII_BUS_ID_SIZE, "ngbe-%x",
270
-
(pdev->bus->number << 8) | pdev->devfn);
269
+
snprintf(mii_bus->id, MII_BUS_ID_SIZE, "ngbe-%x", pci_dev_id(pdev));
271
270
ret = devm_mdiobus_register(&pdev->dev, mii_bus);
272
271
if (ret)
273
272
return ret;