Commit 4f31c532 authored by Sudheesh Mavila's avatar Sudheesh Mavila Committed by David S. Miller
Browse files

net: phy: corrected the return value for genphy_check_and_restart_aneg and... 


net: phy: corrected the return value for genphy_check_and_restart_aneg and genphy_c45_check_and_restart_aneg

When auto-negotiation is not required, return value should be zero.

Changes v1->v2:
- improved comments and code as Andrew Lunn and Heiner Kallweit suggestion
- fixed issue in genphy_c45_check_and_restart_aneg as Russell King
  suggestion.

Fixes: 2a10ab04 ("net: phy: add genphy_check_and_restart_aneg()")
Fixes: 1af9f168 ("net: phy: add genphy_c45_check_and_restart_aneg()")
Signed-off-by: default avatarSudheesh Mavila <sudheesh.mavila@amd.com>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f596c870

drivers/net/phy/phy-c45.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_restart_aneg); 
 */

 */

int genphy_c45_check_and_restart_aneg(struct phy_device *phydev, bool restart)

int genphy_c45_check_and_restart_aneg(struct phy_device *phydev, bool restart)

{

{

	int ret = 0;

	int ret;





	if (!restart) {

	if (!restart) {

		/* Configure and restart aneg if it wasn't set before */

		/* Configure and restart aneg if it wasn't set before */
@@ -180,9 +180,9 @@ int genphy_c45_check_and_restart_aneg(struct phy_device *phydev, bool restart) 
	}

	}





	if (restart)

	if (restart)

		ret = genphy_c45_restart_aneg(phydev);

		return genphy_c45_restart_aneg(phydev);





	return ret;

	return 0;

}

}

EXPORT_SYMBOL_GPL(genphy_c45_check_and_restart_aneg);

EXPORT_SYMBOL_GPL(genphy_c45_check_and_restart_aneg);

drivers/net/phy/phy_device.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1793,7 +1793,7 @@ EXPORT_SYMBOL(genphy_restart_aneg); 
 */

 */

int genphy_check_and_restart_aneg(struct phy_device *phydev, bool restart)

int genphy_check_and_restart_aneg(struct phy_device *phydev, bool restart)

{

{

	int ret = 0;

	int ret;





	if (!restart) {

	if (!restart) {

		/* Advertisement hasn't changed, but maybe aneg was never on to

		/* Advertisement hasn't changed, but maybe aneg was never on to
@@ -1808,9 +1808,9 @@ int genphy_check_and_restart_aneg(struct phy_device *phydev, bool restart) 
	}

	}





	if (restart)

	if (restart)

		ret = genphy_restart_aneg(phydev);

		return genphy_restart_aneg(phydev);





	return ret;

	return 0;

}

}

EXPORT_SYMBOL(genphy_check_and_restart_aneg);

EXPORT_SYMBOL(genphy_check_and_restart_aneg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE