47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
|
From faea89cd893a1a7af81185f026a64dad603ef72f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||
|
|
Date: Sun, 17 Dec 2017 12:58:12 +0100
|
||
|
|
Subject: [PATCH 4/4] 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: Jonas Gorski <jonas.gorski@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 +--
|
||
|
|
drivers/net/ethernet/broadcom/bcm63xx_enet.h | 3 ---
|
||
|
|
2 files changed, 1 insertion(+), 5 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
||
|
|
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
|
||
|
|
@@ -1770,7 +1770,6 @@ static int bcm_enet_probe(struct platfor
|
||
|
|
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)) {
|
||
|
|
@@ -1838,7 +1837,7 @@ static int bcm_enet_probe(struct platfor
|
||
|
|
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
|
||
|
|
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.h
|
||
|
|
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.h
|
||
|
|
@@ -192,9 +192,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;
|
||
|
|
|