From: "Dmitry Kravkov" <dmitry@broadcom.com>
To: davem@davemloft.net, netdev@vger.kernel.org, eilong@broadcom.com
Cc: romueu@fz.zoreil.com, "Dmitry Kravkov" <dmitry@broadcom.com>,
"Francious Romieu" <romieu@fz.zoreil.com>
Subject: [PATCH v3 net-next 3/6] bnx2x: remove non-necessary assignment
Date: Mon, 22 Apr 2013 13:15:05 +0300 [thread overview]
Message-ID: <1366625708-5678-4-git-send-email-dmitry@broadcom.com> (raw)
In-Reply-To: <1366625708-5678-1-git-send-email-dmitry@broadcom.com>
CC: Francious Romieu <romieu@fz.zoreil.com>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index ec07b2b..f4ed10a 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1385,7 +1385,6 @@ static int bnx2x_get_eeprom(struct net_device *dev,
struct ethtool_eeprom *eeprom, u8 *eebuf)
{
struct bnx2x *bp = netdev_priv(dev);
- int rc;
if (!netif_running(dev)) {
DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
@@ -1400,9 +1399,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
/* parameters already validated in ethtool_get_eeprom */
- rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
-
- return rc;
+ return bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
}
static int bnx2x_get_module_eeprom(struct net_device *dev,
--
1.8.1.4
next prev parent reply other threads:[~2013-04-22 10:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 10:15 [PATCH v3 net-next 0/6] bnx2x: refactor nvram related code and update version Dmitry Kravkov
2013-04-22 10:15 ` [PATCH v3 net-next 1/6] bnx2x: refactor nvram read procedure Dmitry Kravkov
2013-04-22 10:15 ` [PATCH v3 net-next 2/6] bnx2x: fix byte-by-byte nvram write for BE machines Dmitry Kravkov
2013-04-22 10:15 ` Dmitry Kravkov [this message]
2013-04-22 10:15 ` [PATCH v3 net-next 4/6] bnx2x: add additional regions for CRC memory test Dmitry Kravkov
2013-04-22 10:15 ` [PATCH v3 net-next 5/6] bnx2x: allow nvram test to run when device is down Dmitry Kravkov
2013-04-22 10:15 ` [PATCH v3 net-next 6/6] bnx2x: update version to 1.78.17-0 Dmitry Kravkov
2013-04-22 13:35 ` [PATCH v3 net-next 0/6] bnx2x: refactor nvram related code and update version Dmitry Kravkov
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=1366625708-5678-4-git-send-email-dmitry@broadcom.com \
--to=dmitry@broadcom.com \
--cc=davem@davemloft.net \
--cc=eilong@broadcom.com \
--cc=netdev@vger.kernel.org \
--cc=romieu@fz.zoreil.com \
--cc=romueu@fz.zoreil.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).