net: phy: marvell: Use phy_read_paged() instead of open coding it
Subsystems (3)
PATCH 1/1 net: phy: marvell: Use phy_read_paged() instead of open coding it
Convert m88e1318_get_wol() to use the well implemented phy_read_paged() instead of open coding it.
Signed-off-by Jisheng Zhang <[email protected]>
--- drivers/net/phy/marvell.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/net/phy/marvell.c +4 -10
@@ -1598,21 +1598,15 @@ static int m88e1121_did_interrupt(struct phy_device *phydev)static void m88e1318_get_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol) { -int oldpage, ret =0 ; +int ret; wol->supported =WAKE_MAGIC ; wol->wolopts =0 ; - oldpage =phy_select_page (phydev,MII_MARVELL_WOL_PAGE ); -if (oldpage <0 ) - goto error; - - ret =__phy_read (phydev,MII_88E1318S_PHY_WOL_CTRL ); -if (ret &MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE ) + ret =phy_read_paged (phydev,MII_MARVELL_WOL_PAGE , +MII_88E1318S_PHY_WOL_CTRL ); +if (ret >=0 && ret &MII_88E1318S_PHY_WOL_CTRL_MAGIC_PACKET_MATCH_ENABLE ) wol->wolopts |=WAKE_MAGIC ; - -error: -phy_restore_page (phydev, oldpage, ret); } static int m88e1318_set_wol(struct phy_device *phydev,
Signature · 1 line
2.28.0
Reviewed-by Marek Behún <[email protected]>
Quoted 4 lines · Jisheng Zhang
Convert
m88e1318_get_wol()to use the well implementedphy_read_paged()instead of open coding it.Signed-off-by Jisheng Zhang <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Andrew
From: Jisheng Zhang <[email protected]>
Date: Mon, 5 Oct 2020 17:19:50 +0800
Quoted 4 lines
Convert
m88e1318_get_wol()to use the well implementedphy_read_paged()instead of open coding it.Signed-off-by Jisheng Zhang <[email protected]>
Applied, thanks!