From 8022940c5c3a12ecdbc8f8866351ee0ef5de1d35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Harboe?= Date: Wed, 16 Jun 2010 00:02:58 +0200 Subject: [PATCH] str7x: -Wshadow warning fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Øyvind Harboe --- src/flash/nor/str7x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c index 46510ed45a..4c450afa97 100644 --- a/src/flash/nor/str7x.c +++ b/src/flash/nor/str7x.c @@ -625,7 +625,7 @@ static int str7x_write(struct flash_bank *bank, uint8_t *buffer, if (bytes_remaining) { uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - int i = 0; + i = 0; while (bytes_remaining > 0) { @@ -680,7 +680,7 @@ COMMAND_HANDLER(str7x_handle_part_id_command) } #endif -static int str7x_info(struct flash_bank *bank, char *buf, int buf_size) +static int get_str7x_info(struct flash_bank *bank, char *buf, int buf_size) { snprintf(buf, buf_size, "str7x flash driver info"); /* STR7x flash doesn't support sector protection interrogation. @@ -795,5 +795,5 @@ struct flash_driver str7x_flash = { .auto_probe = str7x_probe, .erase_check = default_flash_blank_check, .protect_check = str7x_protect_check, - .info = str7x_info, + .info = get_str7x_info, }; -- 2.30.2