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>

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>
Jagannadha Sutradharudu Teki
1 parent fd35ca5c20
Showing 2 changed files with 15 additions and 14 deletions Side-by-side Diff
common/cmd_sf.c
common/env_sf.c
@@ -151,12 +151,12 @@
 		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 @@
 			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 @@
  
 	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 @@
 	/* 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 @@
 		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 @@
 			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 @@
 	/* 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 @@
 }
 #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 @@
 	"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"
@@ -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>
...	...	@@ -151,12 +151,12 @@
151	151	size_t len, const char buf, char cmp_buf, size_t *skipped)
152	152	{
153	153	debug("offset=%#x, sector_size=%#x, len=%#zx\n",
154		- offset, flash->sector_size, len);
	154	+ offset, flash->sector_size, len);
155	155	if (spi_flash_read(flash, offset, len, cmp_buf))
156	156	return "read";
157	157	if (memcmp(cmp_buf, buf, len) == 0) {
158	158	debug("Skip region %x size %zx: no change\n",
159		- offset, len);
	159	+ offset, len);
160	160	*skipped += len;
161	161	return NULL;
162	162	}
...	...	@@ -200,7 +200,7 @@
200	200	todo = min(end - buf, flash->sector_size);
201	201	if (get_timer(last_update) > 100) {
202	202	printf(" \rUpdating, %zu%% %lu B/s",
203		- 100 - (end - buf) / scale,
	203	+ 100 - (end - buf) / scale,
204	204	bytes_per_second(buf - start_buf,
205	205	start_time));
206	206	last_update = get_timer(0);
207	207
...	...	@@ -220,9 +220,9 @@
220	220
221	221	delta = get_timer(start_time);
222	222	printf("%zu bytes written, %zu bytes skipped", len - skipped,
223		- skipped);
	223	+ skipped);
224	224	printf(" in %ld.%lds, speed %ld B/s\n",
225		- delta / 1000, delta % 1000, bytes_per_second(len, start_time));
	225	+ delta / 1000, delta % 1000, bytes_per_second(len, start_time));
226	226
227	227	return 0;
228	228	}
...	...	@@ -252,7 +252,7 @@
252	252	/* Consistency checking */
253	253	if (offset + len > flash->size) {
254	254	printf("ERROR: attempting %s past flash size (%#x)\n",
255		- argv[0], flash->size);
	255	+ argv[0], flash->size);
256	256	return 1;
257	257	}
258	258
259	259
...	...	@@ -262,9 +262,9 @@
262	262	return 1;
263	263	}
264	264
265		- if (strcmp(argv[0], "update") == 0)
	265	+ if (strcmp(argv[0], "update") == 0) {
266	266	ret = spi_flash_update(flash, offset, len, buf);
267		- else if (strncmp(argv[0], "read", 4) == 0 \|\|
	267	+ } else if (strncmp(argv[0], "read", 4) == 0 \|\|
268	268	strncmp(argv[0], "write", 5) == 0) {
269	269	int read;
270	270
...	...	@@ -275,7 +275,7 @@
275	275	ret = spi_flash_write(flash, offset, len, buf);
276	276
277	277	printf("SF: %zu bytes @ %#x %s: %s\n", (size_t)len, (u32)offset,
278		- read ? "Read" : "Written", ret ? "ERROR" : "OK");
	278	+ read ? "Read" : "Written", ret ? "ERROR" : "OK");
279	279	}
280	280
281	281	unmap_physmem(buf, len);
282	282
...	...	@@ -304,13 +304,13 @@
304	304	/* Consistency checking */
305	305	if (offset + len > flash->size) {
306	306	printf("ERROR: attempting %s past flash size (%#x)\n",
307		- argv[0], flash->size);
	307	+ argv[0], flash->size);
308	308	return 1;
309	309	}
310	310
311	311	ret = spi_flash_erase(flash, offset, len);
312	312	printf("SF: %zu bytes @ %#x Erased: %s\n", (size_t)len, (u32)offset,
313		- ret ? "ERROR" : "OK");
	313	+ ret ? "ERROR" : "OK");
314	314
315	315	return ret == 0 ? 0 : 1;
316	316	}
...	...	@@ -470,7 +470,8 @@
470	470	}
471	471	#endif /* CONFIG_CMD_SF_TEST */
472	472
473		-static int do_spi_flash(cmd_tbl_t cmdtp, int flag, int argc, char const argv[])
	473	+static int do_spi_flash(cmd_tbl_t *cmdtp, int flag, int argc,
	474	+ char * const argv[])
474	475	{
475	476	const char *cmd;
476	477	int ret;
...	...	@@ -526,7 +527,7 @@
526	527	"SPI flash sub-system",
527	528	"probe [[bus:]cs] [hz] [mode] - init flash device on given SPI bus\n"
528	529	" and chip select\n"
529		- "sf read addr offset len - read `len' bytes starting at\n"
	530	+ "sf read addr offset len - read `len' bytes starting at\n"
530	531	" `offset' to memory at `addr'\n"
531	532	"sf write addr offset len - write `len' bytes from memory\n"
532	533	" at `addr' to flash at `offset'\n"
...	...	@@ -7,7 +7,7 @@
7	7	*
8	8	* (C) Copyright 2008 Atmel Corporation
9	9	*
10		- * SPDX-License-Identifier: GPL-2.0+
	10	+ * SPDX-License-Identifier: GPL-2.0+
11	11	*/
12	12	#include <common.h>
13	13	#include <environment.h>