public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed

From: Dan Carpenter <dan.carpenter@oracle•com>
To: Nithin Nayak Sujir <nsujir@broadcom•com>
Cc: Michael Chan <mchan@broadcom•com>,
	netdev@vger•kernel.org, kernel-janitors@vger•kernel.org
Subject: [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5()
Date: Wed, 5 Feb 2014 16:29:21 +0300	[thread overview]
Message-ID: <20140205132920.GE800@elgon.mountain> (raw)

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, &reg32)) {
-		reg32 &= ~0x3000;
-		tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
-	} else if (!err)
-		err = -EBUSY;
+	err = tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
+	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)

next             reply	other threads:[~2014-02-05 13:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-05 13:29 Dan Carpenter [this message]
2014-02-06  0:10 ` [patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5() Nithin Nayak Sujir
2014-02-07  4:06 ` David Miller

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e2ca03e23dc dfblob:c466e12b601 )
 OR (
bs:"[patch] tg3: cleanup an error path in tg3_phy_reset_5703_4_5()" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140205132920.GE800@elgon.mountain \
    --to=dan.carpenter@oracle$(echo .)com \
    --cc=kernel-janitors@vger$(echo .)kernel.org \
    --cc=mchan@broadcom$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=nsujir@broadcom$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox