Edward O'Callaghan has uploaded this change for review.

View Change

realtek_mst_i2c_spi.c: Make consistent with std=c99

Use 'modern' C to scope iterator declarations only to
the loop constructs they are used in.

BUG=none
TEST=builds

Change-Id: I9d9d1bf01209a7840f7b3fa2c6f7592375a74330
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M realtek_mst_i2c_spi.c
1 file changed, 4 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/09/47909/1

diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c
index 538b07a..151f7f6 100644
--- a/realtek_mst_i2c_spi.c
+++ b/realtek_mst_i2c_spi.c
@@ -205,7 +205,6 @@
 				const unsigned char *writearr,
 				unsigned char *readarr)
 {
-	unsigned i;
 	int max_timeout_mul = 1;
 	int ret = 0;
 
@@ -262,7 +261,7 @@
 	ret |= realtek_mst_i2c_spi_write_register(fd, 0x60, ctrl_reg_val);
 	ret |= realtek_mst_i2c_spi_write_register(fd, 0x61, writearr[0]); /* opcode */
 
-	for (i = 0; i < writecnt; ++i)
+	for (unsigned i = 0; i < writecnt; ++i)
 		ret |= realtek_mst_i2c_spi_write_register(fd, 0x64 + i, writearr[i + 1]);
 	ret |= realtek_mst_i2c_spi_write_register(fd, 0x60, ctrl_reg_val | 0x1);
 	if (ret)
@@ -272,7 +271,7 @@
 	if (ret)
 		return ret;
 
-	for (i = 0; i < readcnt; ++i)
+	for (unsigned i = 0; i < readcnt; ++i)
 		ret |= realtek_mst_i2c_spi_read_register(fd, 0x67 + i, &readarr[i]);
 
 	return ret;
@@ -306,7 +305,6 @@
 static int realtek_mst_i2c_spi_read(struct flashctx *flash, uint8_t *buf,
 			unsigned int start, unsigned int len)
 {
-	unsigned i;
 	int ret = 0;
 
 	if (start & 0xff)
@@ -339,7 +337,7 @@
 	uint8_t dummy;
 	realtek_mst_i2c_spi_read_register(fd, MCU_DATA_PORT, &dummy);
 
-	for (i = 0; i < len; i += PAGE_SIZE) {
+	for (unsigned i = 0; i < len; i += PAGE_SIZE) {
 		ret |= realtek_mst_i2c_spi_read_data(fd, REGISTER_ADDRESS,
 				buf + i, min(len - i, PAGE_SIZE));
 		if (ret)
@@ -352,7 +350,6 @@
 static int realtek_mst_i2c_spi_write_256(struct flashctx *flash, const uint8_t *buf,
 				unsigned int start, unsigned int len)
 {
-	unsigned i;
 	int ret = 0;
 
 	if (start & 0xff)
@@ -369,7 +366,7 @@
 	ret |= realtek_mst_i2c_spi_write_register(fd, 0x6D, 0x02); /* write opcode */
 	ret |= realtek_mst_i2c_spi_write_register(fd, 0x71, (PAGE_SIZE - 1)); /* fit len=256 */
 
-	for (i = 0; i < len; i += PAGE_SIZE) {
+	for (unsigned i = 0; i < len; i += PAGE_SIZE) {
 		uint16_t page_len = min(len - i, PAGE_SIZE);
 		if (len - i < PAGE_SIZE)
 			ret |= realtek_mst_i2c_spi_write_register(fd, 0x71, page_len-1);

To view, visit change 47909. To unsubscribe, or for help writing mail filters, visit settings.