Edward O'Callaghan has uploaded this change for review.

View Change

lspcon_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: Id61f8416416d2f625d424760e00f94dc730105f4
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M lspcon_i2c_spi.c
1 file changed, 3 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/10/47910/1

diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c
index 7b9f1c0..6ee2840 100644
--- a/lspcon_i2c_spi.c
+++ b/lspcon_i2c_spi.c
@@ -127,14 +127,13 @@
 
 static int lspcon_i2c_spi_register_control(int fd, packet_t *packet)
 {
-	int i;
 	int ret = lspcon_i2c_spi_write_register(fd, SWSPI_WDATA, packet->command);
 	if (ret)
 		return ret;
 
 	/* Higher 4 bits are read size. */
 	int write_size = packet->data_size & 0x0f;
-	for (i = 0; i < write_size; ++i) {
+	for (unsigned i = 0; i < write_size; ++i) {
 		ret |= lspcon_i2c_spi_write_register(fd, SWSPI_WDATA, packet->data[i]);
 	}
 
@@ -256,7 +255,6 @@
 				const unsigned char *writearr,
 				unsigned char *readarr)
 {
-	unsigned int i;
 	if (writecnt > 16 || readcnt > 16 || writecnt == 0) {
 		msg_perr("%s: Invalid read/write count for send command.\n",
                          __func__);
@@ -285,7 +283,7 @@
 	if (ret)
 		return ret;
 
-	for (i = 0; i < readcnt; ++i) {
+	for (unsigned i = 0; i < readcnt; ++i) {
 		ret |= lspcon_i2c_spi_read_register(fd, SWSPI_RDATA, &readarr[i]);
 	}
 
@@ -340,7 +338,6 @@
 static int lspcon_i2c_spi_read(struct flashctx *flash, uint8_t *buf,
 			unsigned int start, unsigned int len)
 {
-	unsigned int i;
 	int ret = 0;
 	if (start & 0xff)
 		return default_spi_read(flash, buf, start, len);
@@ -349,7 +346,7 @@
 	if (fd < 0)
 		return SPI_GENERIC_ERROR;
 
-	for (i = 0; i < len; i += PAGE_SIZE) {
+	for (unsigned i = 0; i < len; i += PAGE_SIZE) {
 		ret |= lspcon_i2c_spi_map_page(fd, start + i);
 		ret |= lspcon_i2c_spi_read_data(fd, PAGE_ADDRESS, buf + i, min(len - i, PAGE_SIZE));
 	}

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