diff options
| author | Jagannadha Sutradharudu Teki <jaganna@xilinx.com> | 2013-07-29 22:12:52 +0530 | 
|---|---|---|
| committer | Jagannadha Sutradharudu Teki <jaganna@xilinx.com> | 2013-08-06 23:58:43 +0530 | 
| commit | 402ba1e3a0a6ccb100f84502f36774d6d4c3cec3 (patch) | |
| tree | 09ee5c1a158a37cef3955a69f54676374d07fc6e | |
| parent | fd35ca5c205333414ffc5f011f7427c3375852d1 (diff) | |
| download | olio-uboot-2014.01-402ba1e3a0a6ccb100f84502f36774d6d4c3cec3.tar.xz olio-uboot-2014.01-402ba1e3a0a6ccb100f84502f36774d6d4c3cec3.zip | |
cmd_sf|env_sf: Fix code cleanup
- line over 80 characters
- add tabs
- CHECK: Alignment should match open parenthesis
Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
| -rw-r--r-- | common/cmd_sf.c | 27 | ||||
| -rw-r--r-- | common/env_sf.c | 2 | 
2 files changed, 15 insertions, 14 deletions
| diff --git a/common/cmd_sf.c b/common/cmd_sf.c index 19b0dc9f4..34844ac4a 100644 --- a/common/cmd_sf.c +++ b/common/cmd_sf.c @@ -151,12 +151,12 @@ static const char *spi_flash_update_block(struct spi_flash *flash, u32 offset,  		size_t len, const char *buf, char *cmp_buf, size_t *skipped)  {  	debug("offset=%#x, sector_size=%#x, len=%#zx\n", -		offset, flash->sector_size, len); +	      offset, flash->sector_size, len);  	if (spi_flash_read(flash, offset, len, cmp_buf))  		return "read";  	if (memcmp(cmp_buf, buf, len) == 0) {  		debug("Skip region %x size %zx: no change\n", -			offset, len); +		      offset, len);  		*skipped += len;  		return NULL;  	} @@ -200,7 +200,7 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,  			todo = min(end - buf, flash->sector_size);  			if (get_timer(last_update) > 100) {  				printf("   \rUpdating, %zu%% %lu B/s", -					100 - (end - buf) / scale, +				       100 - (end - buf) / scale,  					bytes_per_second(buf - start_buf,  							 start_time));  				last_update = get_timer(0); @@ -220,9 +220,9 @@ static int spi_flash_update(struct spi_flash *flash, u32 offset,  	delta = get_timer(start_time);  	printf("%zu bytes written, %zu bytes skipped", len - skipped, -		skipped); +	       skipped);  	printf(" in %ld.%lds, speed %ld B/s\n", -		delta / 1000, delta % 1000, bytes_per_second(len, start_time)); +	       delta / 1000, delta % 1000, bytes_per_second(len, start_time));  	return 0;  } @@ -252,7 +252,7 @@ static int do_spi_flash_read_write(int argc, char * const argv[])  	/* Consistency checking */  	if (offset + len > flash->size) {  		printf("ERROR: attempting %s past flash size (%#x)\n", -			argv[0], flash->size); +		       argv[0], flash->size);  		return 1;  	} @@ -262,9 +262,9 @@ static int do_spi_flash_read_write(int argc, char * const argv[])  		return 1;  	} -	if (strcmp(argv[0], "update") == 0) +	if (strcmp(argv[0], "update") == 0) {  		ret = spi_flash_update(flash, offset, len, buf); -	else if (strncmp(argv[0], "read", 4) == 0 || +	} else if (strncmp(argv[0], "read", 4) == 0 ||  			strncmp(argv[0], "write", 5) == 0) {  		int read; @@ -275,7 +275,7 @@ static int do_spi_flash_read_write(int argc, char * const argv[])  			ret = spi_flash_write(flash, offset, len, buf);  		printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset, -			read ? "Read" : "Written", ret ? "ERROR" : "OK"); +		       read ? "Read" : "Written", ret ? "ERROR" : "OK");  	}  	unmap_physmem(buf, len); @@ -304,13 +304,13 @@ static int do_spi_flash_erase(int argc, char * const argv[])  	/* Consistency checking */  	if (offset + len > flash->size) {  		printf("ERROR: attempting %s past flash size (%#x)\n", -			argv[0], flash->size); +		       argv[0], flash->size);  		return 1;  	}  	ret = spi_flash_erase(flash, offset, len);  	printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset, -			ret ? "ERROR" : "OK"); +	       ret ? "ERROR" : "OK");  	return ret == 0 ? 0 : 1;  } @@ -470,7 +470,8 @@ static int do_spi_flash_test(int argc, char * const argv[])  }  #endif /* CONFIG_CMD_SF_TEST */ -static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc, +			char * const argv[])  {  	const char *cmd;  	int ret; @@ -526,7 +527,7 @@ U_BOOT_CMD(  	"SPI flash sub-system",  	"probe [[bus:]cs] [hz] [mode]	- init flash device on given SPI bus\n"  	"				  and chip select\n" -	"sf read addr offset len 	- read `len' bytes starting at\n" +	"sf read addr offset len	- read `len' bytes starting at\n"  	"				  `offset' to memory at `addr'\n"  	"sf write addr offset len	- write `len' bytes from memory\n"  	"				  at `addr' to flash at `offset'\n" diff --git a/common/env_sf.c b/common/env_sf.c index e3e1897cc..9f806fb09 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -7,7 +7,7 @@   *   * (C) Copyright 2008 Atmel Corporation   * - * SPDX-License-Identifier:	GPL-2.0+  + * SPDX-License-Identifier:	GPL-2.0+   */  #include <common.h>  #include <environment.h> |