Commit 114d7fc0 "e1000: Rewrite EEPROM checksum error to give more information" failed to initialize the checksum variable which should result in random results. Fix that.
Commit 2326a94d caused a ton of "unused variable 'x'" warnings. Fix these. While we are at it, remove some bogus parens.
Signed-off-by: Wolfgang Denk wd@denx.de Cc: Kyle Moffett Kyle.D.Moffett@boeing.com --- v2: Added do{}while(0) for E1000_WRITE_FLUSH as requested.
drivers/net/e1000.c | 1 + drivers/net/e1000.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index c86bf0a..6eab7b2 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -884,6 +884,7 @@ static int e1000_validate_eeprom_checksum(struct e1000_hw *hw) }
/* Compute the checksum */ + checksum = 0; for (i = 0; i < EEPROM_CHECKSUM_REG; i++) checksum += buf[i]; checksum = ((uint16_t)EEPROM_SUM) - checksum; diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h index 05f2bce..d8400d4 100644 --- a/drivers/net/e1000.h +++ b/drivers/net/e1000.h @@ -62,15 +62,15 @@
/* I/O wrapper functions */ #define E1000_WRITE_REG(a, reg, value) \ - (writel((value), ((a)->hw_addr + E1000_##reg))) + writel((value), ((a)->hw_addr + E1000_##reg)) #define E1000_READ_REG(a, reg) \ - (readl((a)->hw_addr + E1000_##reg)) + readl((a)->hw_addr + E1000_##reg) #define E1000_WRITE_REG_ARRAY(a, reg, offset, value) \ - (writel((value), ((a)->hw_addr + E1000_##reg + ((offset) << 2)))) + writel((value), ((a)->hw_addr + E1000_##reg + ((offset) << 2))) #define E1000_READ_REG_ARRAY(a, reg, offset) \ - (readl((a)->hw_addr + E1000_##reg + ((offset) << 2))) + readl((a)->hw_addr + E1000_##reg + ((offset) << 2)) #define E1000_WRITE_FLUSH(a) \ - do { uint32_t x = E1000_READ_REG(a, STATUS); } while (0) + do { E1000_READ_REG(a, STATUS); } while (0)
/* Forward declarations of structures used by the shared code */ struct e1000_hw;