Commit bac3d0f2 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phy: marvell: use phydev->eee_cfg.eee_enabled 



Rather than calling genphy_c45_ethtool_get_eee() to retrieve whether
EEE is enabled, use the value stored in the phy_device eee_cfg
structure.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/E1tJ9J2-006LIh-Fl@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 48697bdf

drivers/net/phy/marvell.c

+1 −3
Original line number Diff line number Diff line
@@ -1550,7 +1550,6 @@ static int m88e1540_get_fld(struct phy_device *phydev, u8 *msecs) 


static int m88e1540_set_fld(struct phy_device *phydev, const u8 *msecs)

{

	struct ethtool_keee eee;

	int val, ret;



	if (*msecs == ETHTOOL_PHY_FAST_LINK_DOWN_OFF)
@@ -1560,8 +1559,7 @@ static int m88e1540_set_fld(struct phy_device *phydev, const u8 *msecs) 
	/* According to the Marvell data sheet EEE must be disabled for

	 * Fast Link Down detection to work properly

	 */

	ret = genphy_c45_ethtool_get_eee(phydev, &eee);

	if (!ret && eee.eee_enabled) {

	if (phydev->eee_cfg.eee_enabled) {

		phydev_warn(phydev, "Fast Link Down detection requires EEE to be disabled!\n");

		return -EBUSY;

	}