Skip to content

Commit d7bed82

Browse files
hkallweitdavem330
authored andcommitted
net: phy: use genphy_c45_aneg_done in genphy_aneg_done
Now that we have it let's use genphy_c45_aneg_done() in phy_aneg_done(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 6bfc112 commit d7bed82

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

drivers/net/phy/phy.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,10 @@ int phy_aneg_done(struct phy_device *phydev)
144144
{
145145
if (phydev->drv && phydev->drv->aneg_done)
146146
return phydev->drv->aneg_done(phydev);
147-
148-
/* Avoid genphy_aneg_done() if the Clause 45 PHY does not
149-
* implement Clause 22 registers
150-
*/
151-
if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0)))
152-
return -EINVAL;
153-
154-
return genphy_aneg_done(phydev);
147+
else if (phydev->is_c45)
148+
return genphy_c45_aneg_done(phydev);
149+
else
150+
return genphy_aneg_done(phydev);
155151
}
156152
EXPORT_SYMBOL(phy_aneg_done);
157153

0 commit comments

Comments
 (0)