2020-02-26 07:11:48

by Sudheesh Mavila

Subject: [PATCH v2 ] 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: 2a10ab043ac5 ("net: phy: add genphy_check_and_restart_aneg()")
Fixes: 1af9f16840e9 ("net: phy: add genphy_c45_check_and_restart_aneg()")
Signed-off-by: Sudheesh Mavila <[email protected]>
---
drivers/net/phy/phy-c45.c | 6 +++---
drivers/net/phy/phy_device.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index a1caeee12236..dd2e23fb67c0 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -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);

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 6a5056e0ae77..8b16775b9324 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1792,7 +1792,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
@@ -1807,9 +1807,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);

--
2.17.1

2020-02-26 07:14:38

by Heiner Kallweit

Subject: Re: [PATCH v2 ] net: phy: corrected the re turn value for genphy_check_and_restart_aneg and genphy _c45_check_and_restart_aneg

On 26.02.2020 08:10, Sudheesh Mavila wrote:
> 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: 2a10ab043ac5 ("net: phy: add genphy_check_and_restart_aneg()")
> Fixes: 1af9f16840e9 ("net: phy: add genphy_c45_check_and_restart_aneg()")
> Signed-off-by: Sudheesh Mavila <[email protected]>
> ---

Reviewed-by: Heiner Kallweit <[email protected]>

2020-02-26 15:52:29

by Andrew Lunn

Subject: Re: [PATCH v2 ] net: phy: corrected the return value for genphy_check_and_restart_aneg ?and genphy_c45_check_and_restart_aneg

On Wed, Feb 26, 2020 at 12:40:45PM +0530, Sudheesh Mavila wrote:
> 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: 2a10ab043ac5 ("net: phy: add genphy_check_and_restart_aneg()")
> Fixes: 1af9f16840e9 ("net: phy: add genphy_c45_check_and_restart_aneg()")
> Signed-off-by: Sudheesh Mavila <[email protected]>

Reviewed-by: Andrew Lunn <[email protected]>

Andrew

2020-02-27 04:43:03

by David Miller

Subject: Re: [PATCH v2 ] net: phy: corrected the return value for genphy_check_and_restart_aneg and genphy_c45_check_and_restart_aneg

From: Sudheesh Mavila <[email protected]>
Date: Wed, 26 Feb 2020 12:40:45 +0530

> 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: 2a10ab043ac5 ("net: phy: add genphy_check_and_restart_aneg()")
> Fixes: 1af9f16840e9 ("net: phy: add genphy_c45_check_and_restart_aneg()")
> Signed-off-by: Sudheesh Mavila <[email protected]>

Applied and queued up for -stable, thanks.