2021-06-04 03:26:56

by dingsenjie

Subject: [PATCH] net: phy: Simplify the return expression of dp83640_ack_interrupt

From: dingsenjie <[email protected]>

Simplify the return expression.

Signed-off-by: dingsenjie <[email protected]>
---
drivers/net/phy/dp83640.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
index 0d79f68..bcd14ec 100644
--- a/drivers/net/phy/dp83640.c
+++ b/drivers/net/phy/dp83640.c
@@ -1141,12 +1141,7 @@ static int dp83640_config_init(struct phy_device *phydev)

static int dp83640_ack_interrupt(struct phy_device *phydev)
{
- int err = phy_read(phydev, MII_DP83640_MISR);
-
- if (err < 0)
- return err;
-
- return 0;
+ return phy_read(phydev, MII_DP83640_MISR);
}

static int dp83640_config_intr(struct phy_device *phydev)
--
1.9.1

2021-06-04 07:51:10

by Heiner Kallweit

Subject: Re: [PATCH] net: phy: Simplify the return expression of dp83640_ack_interrupt

On 04.06.2021 05:22, [email protected] wrote:
> From: dingsenjie <[email protected]>
>
> Simplify the return expression.
>
> Signed-off-by: dingsenjie <[email protected]>
> ---
> drivers/net/phy/dp83640.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
> index 0d79f68..bcd14ec 100644
> --- a/drivers/net/phy/dp83640.c
> +++ b/drivers/net/phy/dp83640.c
> @@ -1141,12 +1141,7 @@ static int dp83640_config_init(struct phy_device *phydev)
>
> static int dp83640_ack_interrupt(struct phy_device *phydev)
> {
> - int err = phy_read(phydev, MII_DP83640_MISR);
> -
> - if (err < 0)
> - return err;
> -
> - return 0;
> + return phy_read(phydev, MII_DP83640_MISR);
> }
>
> static int dp83640_config_intr(struct phy_device *phydev)
>
This would be a functional change. You'd return a positive value
instead of 0.

2021-06-04 23:05:34

by Andrew Lunn

Subject: Re: [PATCH] net: phy: Simplify the return expression of dp83640_ack_interrupt

On Fri, Jun 04, 2021 at 09:49:17AM +0200, Heiner Kallweit wrote:
> On 04.06.2021 05:22, [email protected] wrote:
> > From: dingsenjie <[email protected]>
> >
> > Simplify the return expression.
> >
> > Signed-off-by: dingsenjie <[email protected]>
> > ---
> > drivers/net/phy/dp83640.c | 7 +------
> > 1 file changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c
> > index 0d79f68..bcd14ec 100644
> > --- a/drivers/net/phy/dp83640.c
> > +++ b/drivers/net/phy/dp83640.c
> > @@ -1141,12 +1141,7 @@ static int dp83640_config_init(struct phy_device *phydev)
> >
> > static int dp83640_ack_interrupt(struct phy_device *phydev)
> > {
> > - int err = phy_read(phydev, MII_DP83640_MISR);
> > -
> > - if (err < 0)
> > - return err;
> > -
> > - return 0;
> > + return phy_read(phydev, MII_DP83640_MISR);
> > }
> >
> > static int dp83640_config_intr(struct phy_device *phydev)
> >
> This would be a functional change. You'd return a positive value
> instead of 0.

And looking a bit further down in the code:

static int dp83640_ack_interrupt(struct phy_device *phydev)
{
int err = phy_read(phydev, MII_DP83640_MISR);

if (err < 0)
return err;

return 0;
}

static int dp83640_config_intr(struct phy_device *phydev)
{
int micr;
int misr;
int err;

if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
err = dp83640_ack_interrupt(phydev);
if (err)
return err;

So a positive value is going to break the driver.

NACK

Andrew