Neither bb_miiphy_buses nor bb_miiphy_buses_num are used anymore.
Drop both of them.
Reviewed-by: Paul Barker <paul.barker...@bp.renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+rene...@mailbox.org>
---
Cc: Christian Marangi <ansuels...@gmail.com>
Cc: Ilias Apalodimas <ilias.apalodi...@linaro.org>
Cc: Jerome Forissier <jerome.foriss...@linaro.org>
Cc: Jim Liu <jjl...@nuvoton.com>
Cc: Joe Hershberger <joe.hershber...@ni.com>
Cc: Mario Six <mario....@gdsys.cc>
Cc: Michal Simek <michal.si...@amd.com>
Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
Cc: Paul Barker <paul.barker...@bp.renesas.com>
Cc: Ramon Fried <rfried....@gmail.com>
Cc: Simon Glass <s...@chromium.org>
Cc: Sughosh Ganu <sughosh.g...@linaro.org>
Cc: Tom Rini <tr...@konsulko.com>
Cc: u-boot@lists.denx.de
---
V2: Fold in recently added DWC bbmiiphy too
V3: Add RB from Paul
---
board/gdsys/a38x/ihs_phys.c | 34 +---------------------------------
drivers/net/designware.c | 14 --------------
drivers/net/ravb.c | 13 -------------
drivers/net/sh_eth.c | 14 --------------
include/miiphy.h | 3 ---
5 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/board/gdsys/a38x/ihs_phys.c b/board/gdsys/a38x/ihs_phys.c
index 71c9398c77a..0c68087912a 100644
--- a/board/gdsys/a38x/ihs_phys.c
+++ b/board/gdsys/a38x/ihs_phys.c
@@ -289,7 +289,7 @@ int init_octo_phys(uint octo_phy_mask)
uint bus_idx;
/* there are up to four octo-phys on each mdio bus */
- for (bus_idx = 0; bus_idx < bb_miiphy_buses_num; ++bus_idx) {
+ for (bus_idx = 0; bus_idx < ARRAY_SIZE(gpio_mii_set); ++bus_idx) {
uint m;
uint octo_index = bus_idx * 4;
struct mii_dev *bus = NULL;
@@ -325,35 +325,3 @@ int init_octo_phys(uint octo_phy_mask)
return 0;
}
-
-struct bb_miiphy_bus bb_miiphy_buses[] = {
- {
- .mdio_active = mii_mdio_active,
- .mdio_tristate = mii_mdio_tristate,
- .set_mdio = mii_set_mdio,
- .get_mdio = mii_get_mdio,
- .set_mdc = mii_set_mdc,
- .delay = mii_delay,
- .priv = &gpio_mii_set[0],
- },
- {
- .mdio_active = mii_mdio_active,
- .mdio_tristate = mii_mdio_tristate,
- .set_mdio = mii_set_mdio,
- .get_mdio = mii_get_mdio,
- .set_mdc = mii_set_mdc,
- .delay = mii_delay,
- .priv = &gpio_mii_set[1],
- },
- {
- .mdio_active = mii_mdio_active,
- .mdio_tristate = mii_mdio_tristate,
- .set_mdio = mii_set_mdio,
- .get_mdio = mii_get_mdio,
- .set_mdc = mii_set_mdc,
- .delay = mii_delay,
- .priv = &gpio_mii_set[2],
- },
-};
-
-int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 5124982e683..5a6e89c0575 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -290,19 +290,6 @@ static int dw_eth_bb_delay(struct bb_miiphy_bus *bus)
return 0;
}
-struct bb_miiphy_bus bb_miiphy_buses[] = {
- {
- .mdio_active = dw_eth_bb_mdio_active,
- .mdio_tristate = dw_eth_bb_mdio_tristate,
- .set_mdio = dw_eth_bb_set_mdio,
- .get_mdio = dw_eth_bb_get_mdio,
- .set_mdc = dw_eth_bb_set_mdc,
- .delay = dw_eth_bb_delay,
- }
-};
-
-int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
-
static int dw_bb_mdio_init(const char *name, struct udevice *dev)
{
struct dw_eth_dev *dwpriv = dev_get_priv(dev);
@@ -337,7 +324,6 @@ static int dw_bb_mdio_init(const char *name, struct udevice
*dev)
dwpriv->bus = bus;
dwpriv->dev = dev;
- bb_miiphy_buses[0].priv = dwpriv;
snprintf(bus->name, sizeof(bus->name), "%s", name);
bus->read = bb_miiphy_read;
bus->write = bb_miiphy_write;
diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c
index b790de98b48..cb727ae9bc1 100644
--- a/drivers/net/ravb.c
+++ b/drivers/net/ravb.c
@@ -575,7 +575,6 @@ static int ravb_probe(struct udevice *dev)
mdiodev->read = bb_miiphy_read;
mdiodev->write = bb_miiphy_write;
- bb_miiphy_buses[0].priv = eth;
snprintf(mdiodev->name, sizeof(mdiodev->name), dev->name);
/* Copy the bus accessors and private data */
@@ -631,18 +630,6 @@ static int ravb_remove(struct udevice *dev)
return 0;
}
-struct bb_miiphy_bus bb_miiphy_buses[] = {
- {
- .mdio_active = ravb_bb_mdio_active,
- .mdio_tristate = ravb_bb_mdio_tristate,
- .set_mdio = ravb_bb_set_mdio,
- .get_mdio = ravb_bb_get_mdio,
- .set_mdc = ravb_bb_set_mdc,
- .delay = ravb_bb_delay,
- },
-};
-int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
-
static const struct eth_ops ravb_ops = {
.start = ravb_start,
.send = ravb_send,
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c
index b1e35aaf291..83e48609224 100644
--- a/drivers/net/sh_eth.c
+++ b/drivers/net/sh_eth.c
@@ -737,7 +737,6 @@ static int sh_ether_probe(struct udevice *udev)
mdiodev->read = bb_miiphy_read;
mdiodev->write = bb_miiphy_write;
- bb_miiphy_buses[0].priv = eth;
snprintf(mdiodev->name, sizeof(mdiodev->name), udev->name);
/* Copy the bus accessors and private data */
@@ -853,16 +852,3 @@ U_BOOT_DRIVER(eth_sh_ether) = {
.plat_auto = sizeof(struct eth_pdata),
.flags = DM_FLAG_ALLOC_PRIV_DMA,
};
-
-struct bb_miiphy_bus bb_miiphy_buses[] = {
- {
- .mdio_active = sh_eth_bb_mdio_active,
- .mdio_tristate = sh_eth_bb_mdio_tristate,
- .set_mdio = sh_eth_bb_set_mdio,
- .get_mdio = sh_eth_bb_get_mdio,
- .set_mdc = sh_eth_bb_set_mdc,
- .delay = sh_eth_bb_delay,
- }
-};
-
-int bb_miiphy_buses_num = ARRAY_SIZE(bb_miiphy_buses);
diff --git a/include/miiphy.h b/include/miiphy.h
index efeff8ae70b..b879fd16ae3 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -75,9 +75,6 @@ struct bb_miiphy_bus {
struct mii_dev mii;
};
-extern struct bb_miiphy_bus bb_miiphy_buses[];
-extern int bb_miiphy_buses_num;
-
struct bb_miiphy_bus *bb_miiphy_alloc(void);
void bb_miiphy_free(struct bb_miiphy_bus *bus);
--
2.47.2
