tg3: cleanup an error path in tg3_phy_reset_5703_4_5()
PATCH 1/1 tg3: cleanup an error path in tg3_phy_reset_5703_4_5()
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.
drivers/net/ethernet/broadcom/tg3.c +7 -6
@@ -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)
Quoted 26 lines · Dan Carpenter
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
-EBUSYerror code fromtg3_readphy()instead of hard coding it here. And really the original code is confusing to look at.Signed-off-by Dan Carpenter <[email protected]>drivers/net/ethernet/broadcom/tg3.c +2
-5@@ -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)
drivers/net/ethernet/broadcom/tg3.c static int tg3_phy_reset_5703_4_5(struct tg3 *tp) · line 2622
Quoted 10 lines
drivers/net/ethernet/broadcom/tg3.c +5
-1+return err; -return err; + reg32 &= ~0x3000 ; +tg3_writephy (tp,MII_TG3_EXT_CTRL , reg32); + +return 0 ; }static void tg3_carrier_off (struct tg3 *tp)
From: Dan Carpenter <[email protected]>
Date: Wed, 5 Feb 2014 16:29:21 +0300
Quoted 9 lines
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
-EBUSYerror code fromtg3_readphy()instead of hard coding it here. And really the original code is confusing to look at.Signed-off-by Dan Carpenter <[email protected]>
Applied.