mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 06/21] e1000: Do not read same register twice
Date: Tue, 31 May 2016 10:09:25 -0700	[thread overview]
Message-ID: <1464714580-31488-7-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1464714580-31488-1-git-send-email-andrew.smirnov@gmail.com>

EEPROM_INIT_CONTROL2_REG is already read once before entering this
switch statement, so there's not much use in reading its value for the
second time.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/net/e1000/main.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index 6d92cde..11a0a2f 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -839,12 +839,6 @@ static int e1000_setup_link(struct e1000_hw *hw)
 		hw->fc = e1000_fc_full;
 		break;
 	default:
-		ret_val = e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data);
-		if (ret_val) {
-			dev_dbg(hw->dev, "EEPROM Read Error\n");
-			return -E1000_ERR_EEPROM;
-		}
-
 		if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 0)
 			hw->fc = e1000_fc_none;
 		else if ((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == EEPROM_WORD0F_ASM_DIR)
-- 
2.5.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2016-05-31 17:10 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-31 17:09 [PATCH 00/21] e1000 code cleanup and iNVM support Andrey Smirnov
2016-05-31 17:09 ` [PATCH 01/21] e1000: Split driver into multiple files Andrey Smirnov
2016-05-31 17:09 ` [PATCH 02/21] e1000: Include <net.h> in e1000.h Andrey Smirnov
2016-05-31 17:09 ` [PATCH 03/21] e1000: Convert E1000_*_REG macros to functions Andrey Smirnov
2016-05-31 17:09 ` [PATCH 04/21] e1000: Fix a bug in e1000_detect_gig_phy Andrey Smirnov
2016-05-31 17:09 ` [PATCH 05/21] e1000: Remove unnecessary variable Andrey Smirnov
2016-05-31 17:09 ` Andrey Smirnov [this message]
2016-05-31 17:09 ` [PATCH 07/21] e1000: Remove unneeded i210 specific register code Andrey Smirnov
2016-05-31 17:09 ` [PATCH 08/21] e1000: Consolidate register offset fixups Andrey Smirnov
2016-05-31 20:42   ` Trent Piepho
2016-06-01 21:35     ` Andrey Smirnov
2016-05-31 17:09 ` [PATCH 09/21] e1000: Remove 'use_eewr' parameter Andrey Smirnov
2016-05-31 17:09 ` [PATCH 10/21] e1000: Remove 'page_size' Andrey Smirnov
2016-05-31 17:09 ` [PATCH 11/21] e1000: Simplify EEPROM init for e1000_80003es2lan Andrey Smirnov
2016-05-31 17:09 ` [PATCH 12/21] e1000: Simplify EEPROM init for e1000_igb Andrey Smirnov
2016-05-31 17:09 ` [PATCH 13/21] e1000: Consolidate SPI EEPROM init code Andrey Smirnov
2016-05-31 17:09 ` [PATCH 14/21] e1000: Consolidate Microwire " Andrey Smirnov
2016-05-31 17:09 ` [PATCH 15/21] e1000: Fix a bug in e1000_probe() Andrey Smirnov
2016-05-31 17:09 ` [PATCH 16/21] e1000: Remove unnecessary intialization Andrey Smirnov
2016-05-31 17:09 ` [PATCH 17/21] e1000: Refactor Flash/EEPROM reading code Andrey Smirnov
2016-05-31 17:09 ` [PATCH 18/21] e1000: Properly release SW_FW_SYNC semaphore bits Andrey Smirnov
2016-05-31 17:09 ` [PATCH 19/21] e1000: Add EEPROM access locking for i210 Andrey Smirnov
2016-05-31 17:09 ` [PATCH 20/21] e1000: Add a "poll register" function Andrey Smirnov
2016-05-31 17:09 ` [PATCH 21/21] e1000: Expose i210's iNVM as a cdev Andrey Smirnov

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=1464714580-31488-7-git-send-email-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --cc=barebox@lists.infradead.org \
    /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