From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 15 Jun 2010 21:53:36 +0000 (+0200)
Subject: lpc2000: -Wshadow warning fixes
X-Git-Tag: v0.5.0-rc1~608
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0365225c4860d5926c3aacbc2a91a98f873a364e;p=openocd

lpc2000: -Wshadow warning fixes

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c
index 154248ca..866be509 100644
--- a/src/flash/nor/lpc2000.c
+++ b/src/flash/nor/lpc2000.c
@@ -594,7 +594,6 @@ static int lpc2000_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offs
 	if ((offset == 0) && (count >= 0x20) && lpc2000_info->calc_checksum)
 	{
 		uint32_t checksum = 0;
-		int i;
 		for (i = 0; i < 8; i++)
 		{
 			LOG_DEBUG("Vector 0x%2.2x: 0x%8.8" PRIx32, i * 4, buf_get_u32(buffer + (i * 4), 0, 32));
@@ -740,7 +739,7 @@ static int lpc2000_protect_check(struct flash_bank *bank)
 	return ERROR_OK;
 }
 
-static int lpc2000_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_lpc2000_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	struct lpc2000_flash_bank *lpc2000_info = bank->driver_priv;
 
@@ -819,5 +818,5 @@ struct flash_driver lpc2000_flash = {
 	.auto_probe = lpc2000_probe,
 	.erase_check = lpc2000_erase_check,
 	.protect_check = lpc2000_protect_check,
-	.info = lpc2000_info,
+	.info = get_lpc2000_info,
 };