Message ID | 20200419082757.5650-1-michael@walle.cc |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] net: phy: mscc: use mdiobus_get_phy() | expand |
On Sun, Apr 19, 2020 at 10:27:57AM +0200, Michael Walle wrote: > Don't use internal knowledge of the mdio bus core, instead use > mdiobus_get_phy() which does the same thing. > > Signed-off-by: Michael Walle <michael@walle.cc> Thanks Michael Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
From: Michael Walle <michael@walle.cc> Date: Sun, 19 Apr 2020 10:27:57 +0200 > Don't use internal knowledge of the mdio bus core, instead use > mdiobus_get_phy() which does the same thing. > > Signed-off-by: Michael Walle <michael@walle.cc> Applied, thanks.
diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c index acddef79f4e8..5391acdece05 100644 --- a/drivers/net/phy/mscc/mscc_main.c +++ b/drivers/net/phy/mscc/mscc_main.c @@ -1292,7 +1292,7 @@ static int vsc8584_config_pre_init(struct phy_device *phydev) */ static bool vsc8584_is_pkg_init(struct phy_device *phydev, bool reversed) { - struct mdio_device **map = phydev->mdio.bus->mdio_map; + struct mii_bus *bus = phydev->mdio.bus; struct vsc8531_private *vsc8531; struct phy_device *phy; int i, addr; @@ -1306,11 +1306,10 @@ static bool vsc8584_is_pkg_init(struct phy_device *phydev, bool reversed) else addr = vsc8531->base_addr + i; - if (!map[addr]) + phy = mdiobus_get_phy(bus, addr); + if (!phy) continue; - phy = container_of(map[addr], struct phy_device, mdio); - if ((phy->phy_id & phydev->drv->phy_id_mask) != (phydev->drv->phy_id & phydev->drv->phy_id_mask)) continue;
Don't use internal knowledge of the mdio bus core, instead use mdiobus_get_phy() which does the same thing. Signed-off-by: Michael Walle <michael@walle.cc> --- drivers/net/phy/mscc/mscc_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)