Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7fe89e3 authored by Jonas Gorski's avatar Jonas Gorski Committed by David S. Miller
Browse files

bcm63xx_enet: use platform device id directly for miibus name 



Directly use the platform device for generating the miibus name. This
removes the last user of bcm_enet_priv::mac_id and we can remove the
field.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbd62d24

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+1 −2
Original line number Diff line number Diff line
@@ -1750,7 +1750,6 @@ static int bcm_enet_probe(struct platform_device *pdev) 
	dev->irq = priv->irq = res_irq->start;

	priv->irq_rx = res_irq_rx->start;

	priv->irq_tx = res_irq_tx->start;

	priv->mac_id = pdev->id;



	priv->mac_clk = devm_clk_get(&pdev->dev, "enet");

	if (IS_ERR(priv->mac_clk)) {
@@ -1818,7 +1817,7 @@ static int bcm_enet_probe(struct platform_device *pdev) 
		bus->priv = priv;

		bus->read = bcm_enet_mdio_read_phylib;

		bus->write = bcm_enet_mdio_write_phylib;

		sprintf(bus->id, "%s-%d", pdev->name, priv->mac_id);

		sprintf(bus->id, "%s-%d", pdev->name, pdev->id);



		/* only probe bus where we think the PHY is, because

		 * the mdio read operation return 0 instead of 0xffff

drivers/net/ethernet/broadcom/bcm63xx_enet.h

+0 −3
Original line number Diff line number Diff line
@@ -193,9 +193,6 @@ struct bcm_enet_mib_counters { 


struct bcm_enet_priv {



	/* mac id (from platform device id) */

	int mac_id;



	/* base remapped address of device */

	void __iomem *base;