* [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5()
@ 2014-02-05 13:29 Dan Carpenter
2014-02-06 0:10 ` Nithin Nayak Sujir
2014-02-07 4:06 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2014-02-05 13:29 UTC (permalink / raw)
To: Nithin Nayak Sujir; +Cc: Michael Chan, netdev, kernel-janitors
In the original code, if tg3_readphy() fails then it does an unnecessary
check to verify "err" is still zero and then returns -EBUSY.
My static checker complains about the unnecessary "if (!err)" check and
anyway it is better to propagate the -EBUSY error code from
tg3_readphy() instead of hard coding it here. And really the original
code is confusing to look at.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index e2ca03e23dc1..c466e12b601e 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -2609,13 +2609,14 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
tg3_writephy(tp, MII_CTRL1000, phy9_orig);
- if (!tg3_readphy(tp, MII_TG3_EXT_CTRL, ®32)) {
- reg32 &= ~0x3000;
- tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
- } else if (!err)
- err = -EBUSY;
+ err = tg3_readphy(tp, MII_TG3_EXT_CTRL, ®32);
+ if (err)
+ return err;
- return err;
+ reg32 &= ~0x3000;
+ tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
+
+ return 0;
}
static void tg3_carrier_off(struct tg3 *tp)
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5()
2014-02-05 13:29 [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5() Dan Carpenter
@ 2014-02-06 0:10 ` Nithin Nayak Sujir
2014-02-07 4:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Nithin Nayak Sujir @ 2014-02-06 0:10 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Michael Chan, netdev, kernel-janitors
On 02/05/2014 05:29 AM, Dan Carpenter wrote:
> In the original code, if tg3_readphy() fails then it does an unnecessary
> check to verify "err" is still zero and then returns -EBUSY.
>
> My static checker complains about the unnecessary "if (!err)" check and
> anyway it is better to propagate the -EBUSY error code from
> tg3_readphy() instead of hard coding it here. And really the original
> code is confusing to look at.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
> index e2ca03e23dc1..c466e12b601e 100644
> --- a/drivers/net/ethernet/broadcom/tg3.c
> +++ b/drivers/net/ethernet/broadcom/tg3.c
> @@ -2609,13 +2609,14 @@ static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
>
> tg3_writephy(tp, MII_CTRL1000, phy9_orig);
>
> - if (!tg3_readphy(tp, MII_TG3_EXT_CTRL, ®32)) {
> - reg32 &= ~0x3000;
> - tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
> - } else if (!err)
> - err = -EBUSY;
> + err = tg3_readphy(tp, MII_TG3_EXT_CTRL, ®32);
> + if (err)
> + return err;
>
> - return err;
> + reg32 &= ~0x3000;
> + tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
> +
> + return 0;
> }
>
> static void tg3_carrier_off(struct tg3 *tp)
>
Acked-by: Nithin Nayak Sujir <nsujir@broadcom.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5()
2014-02-05 13:29 [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5() Dan Carpenter
2014-02-06 0:10 ` Nithin Nayak Sujir
@ 2014-02-07 4:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2014-02-07 4:06 UTC (permalink / raw)
To: dan.carpenter; +Cc: nsujir, mchan, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 5 Feb 2014 16:29:21 +0300
> In the original code, if tg3_readphy() fails then it does an unnecessary
> check to verify "err" is still zero and then returns -EBUSY.
>
> My static checker complains about the unnecessary "if (!err)" check and
> anyway it is better to propagate the -EBUSY error code from
> tg3_readphy() instead of hard coding it here. And really the original
> code is confusing to look at.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-07 4:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-05 13:29 [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5() Dan Carpenter
2014-02-06 0:10 ` Nithin Nayak Sujir
2014-02-07 4:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).