From f9acaa894fbb15ec93463bc4f5eaceb23e0ba3c1 Mon Sep 17 00:00:00 2001
From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Wed, 16 Jun 2010 00:05:58 +0200
Subject: str9x: -Wshadow warning fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---
src/flash/nor/str9x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index e8e942ee..103af16d 100644
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -564,7 +564,7 @@ static int str9x_write(struct flash_bank *bank,
if (bytes_remaining)
{
uint8_t last_halfword[2] = {0xff, 0xff};
- int i = 0;
+ i = 0;
while (bytes_remaining > 0)
{
@@ -621,7 +621,7 @@ COMMAND_HANDLER(str9x_handle_part_id_command)
}
#endif
-static int str9x_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_str9x_info(struct flash_bank *bank, char *buf, int buf_size)
{
snprintf(buf, buf_size, "str9x flash driver info");
return ERROR_OK;
@@ -706,5 +706,5 @@ struct flash_driver str9x_flash = {
.auto_probe = str9x_probe,
.erase_check = default_flash_blank_check,
.protect_check = str9x_protect_check,
- .info = str9x_info,
+ .info = get_str9x_info,
};
--
cgit v1.2.3