diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-28 07:37:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-03 20:33:19 +0100 |
| commit | 7a341066117f9eb5eb9385f61176ef6a08b90163 (patch) | |
| tree | b03f87a066fe3325045b0ab33299df40af3f8c2c | |
| parent | ce5207e191c59b3135303fd03b98dd2ac3701ba2 (diff) | |
| download | talos-obmc-uboot-7a341066117f9eb5eb9385f61176ef6a08b90163.tar.gz talos-obmc-uboot-7a341066117f9eb5eb9385f61176ef6a08b90163.zip | |
e1000: fix bugs from recent commits
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>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
| -rw-r--r-- | drivers/net/e1000.c | 1 | ||||
| -rw-r--r-- | 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 c86bf0a0e7..6eab7b2cfb 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 05f2bcea29..d8400d4590 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; |
