From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonas Gorski Subject: [PATCH 4/4] bcm63xx_enet: use platform device id directly for miibus name Date: Sun, 17 Dec 2017 17:02:55 +0100 Message-ID: <20171217160255.30342-5-jonas.gorski@gmail.com> References: <20171217160255.30342-1-jonas.gorski@gmail.com> Cc: Ralf Baechle , "David S. Miller" , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com To: netdev@vger.kernel.org, linux-mips@linux-mips.org Return-path: Received: from mail-wr0-f195.google.com ([209.85.128.195]:33966 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754075AbdLQQDV (ORCPT ); Sun, 17 Dec 2017 11:03:21 -0500 Received: by mail-wr0-f195.google.com with SMTP id y21so11966145wrc.1 for ; Sun, 17 Dec 2017 08:03:20 -0800 (PST) In-Reply-To: <20171217160255.30342-1-jonas.gorski@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: 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: Jonas Gorski --- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 +-- drivers/net/ethernet/broadcom/bcm63xx_enet.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index d4519c621d08..1fbbbabe7588 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c @@ -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 diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.h b/drivers/net/ethernet/broadcom/bcm63xx_enet.h index 5a66728d4776..1d3c917eb830 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h @@ -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; -- 2.13.2