net: phy: corrected the return value for genphy_check_and_restart_aneg and... (4f31c532) · Commits · 戴 / test

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: ("net: phy: add genphy_check_and_restart_aneg()") Fixes: ("net: phy: add genphy_c45_check_and_restart_aneg()") Signed-off-by:

Sudheesh Mavila <sudheesh.mavila@amd.com> Reviewed-by:

Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/phy/phy-c45.c

+3 −3

Original line number	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 ret = 0;
		int ret;

		if (!restart) {
		/* 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)
		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);

drivers/net/phy/phy_device.c

+3 −3

Original line number	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 ret = 0;
		int ret;

		if (!restart) {
		/* 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)
		ret = genphy_restart_aneg(phydev);
		return genphy_restart_aneg(phydev);

		return ret;
		return 0;
		}
		EXPORT_SYMBOL(genphy_check_and_restart_aneg);

Admin message