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 <[email protected]>
---
 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
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Reply via email to