diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2016-06-01 21:58:35 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-03 09:14:14 +0200 |
| commit | 3d6832758711278393ef60f4e6568c77009d59d2 (patch) | |
| tree | edf94a1f749c1330ae113986c6dd82389ce606fe /drivers/net | |
| parent | 2ea081c242269616dbcec8c176fbf5589ec66078 (diff) | |
| download | barebox-3d6832758711278393ef60f4e6568c77009d59d2.tar.gz barebox-3d6832758711278393ef60f4e6568c77009d59d2.tar.xz | |
e1000: Do not read same register twice
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 6d92cdedde..11a0a2f5e2 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) |