Skip to contentSkip to conversation

post/post.c: CodingStyle cleanup

PATCH New Wolfgang Denk 2 participants 7 messages Oct 29, 2011 – Nov 3, 2011

lore
Share & tools
lore

Wolfgang Denk

author
#0 lore raw

PATCH 1/2 post/post.c: CodingStyle cleanup

Make checkpatch-clean..

Signed-off-by Wolfgang Denk <[email protected]>
---
 post/post.c |   59 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 27 insertions(+), 32 deletions(-)
post/post.c +27 -32
index dc9c0f2..ab8e959 100644
@@ -48,9 +48,8 @@ int post_init_f(void)
 	for (i = 0; i < post_list_size; i++) {
 		struct post_test *test = post_list + i;
 
-		if (test->init_f && test->init_f()) {
+		if (test->init_f && test->init_f())
 			res = -1;
-		}
 	}
 
 	gd->post_init_f_time = post_time_ms(0);

@@ -106,7 +105,7 @@ void post_bootmode_init(void)
 		newword = BOOTMODE_MAGIC | POST_NORMAL;
 	else
 		/* Use old value */
-		newword = post_word_load () & ~POST_COLDBOOT;
+		newword = post_word_load() & ~POST_COLDBOOT;
 
 	if (bootmode == 0)
 		/* We are booting after power-on */

@@ -153,9 +152,9 @@ void post_output_backlog(void)
 
 	for (j = 0; j < post_list_size; j++) {
 		if (gd->post_log_word & (post_list[j].testid)) {
-			post_log ("POST %s ", post_list[j].cmd);
+			post_log("POST %s ", post_list[j].cmd);
 			if (gd->post_log_res & post_list[j].testid)
-				post_log ("PASSED\n");
+				post_log("PASSED\n");
 			else {
 				post_log("FAILED\n");
 				show_boot_progress(-31);

@@ -199,12 +198,11 @@ static void post_get_env_flags(int *test_flags)
 	int i, j;
 
 	for (i = 0; i < varnum; i++) {
-		if (getenv_f(var[i], list, sizeof (list)) <= 0)
+		if (getenv_f(var[i], list, sizeof(list)) <= 0)
 			continue;
 
-		for (j = 0; j < post_list_size; j++) {
+		for (j = 0; j < post_list_size; j++)
 			test_flags[j] &= ~flag[i];
-		}
 
 		last = 0;
 		name = list;

@@ -222,14 +220,14 @@ static void post_get_env_flags(int *test_flags)
 				*s = 0;
 
 			for (j = 0; j < post_list_size; j++) {
-				if (strcmp (post_list[j].cmd, name) == 0) {
+				if (strcmp(post_list[j].cmd, name) == 0) {
 					test_flags[j] |= flag[i];
 					break;
 				}
 			}
 
 			if (j == post_list_size)
-				printf ("No such test: %s\n", name);
+				printf("No such test: %s\n", name);
 
 			name = s + 1;
 		}

@@ -264,7 +262,7 @@ static int post_run_single(struct post_test *test,
 {
 	if ((flags & test_flags & POST_ALWAYS) &&
 		(flags & test_flags & POST_MEM)) {
-		WATCHDOG_RESET ();
+		WATCHDOG_RESET();
 
 		if (!(flags & POST_REBOOT)) {
 			if ((test_flags & POST_REBOOT) &&

@@ -283,11 +281,10 @@ static int post_run_single(struct post_test *test,
 		show_post_progress(i, POST_BEFORE, POST_FAILED);
 
 		if (test_flags & POST_PREREL) {
-			if ((*test->test) (flags) == 0) {
+			if ((*test->test)(flags) == 0) {
 				post_log_mark_succ(test->testid);
 				show_post_progress(i, POST_AFTER, POST_PASSED);
-			}
-			else {
+			} else {
 				show_post_progress(i, POST_AFTER, POST_FAILED);
 				if (test_flags & POST_CRITICAL)
 					gd->flags |= GD_FLG_POSTFAIL;

@@ -309,9 +306,8 @@ static int post_run_single(struct post_test *test,
 			}
 		}
 
-		if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
+		if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL))
 			post_bootmode_test_off();
-		}
 
 		return 0;
 	} else {

@@ -319,7 +315,7 @@ static int post_run_single(struct post_test *test,
 	}
 }
 
-int post_run (char *name, int flags)
+int post_run(char *name, int flags)
 {
 	unsigned int i;
 	int test_flags[POST_MAX_NUMBER];

@@ -366,7 +362,7 @@ int post_run (char *name, int flags)
 		return 0;
 	} else {
 		for (i = 0; i < post_list_size; i++) {
-			if (strcmp (post_list[i].cmd, name) == 0)
+			if (strcmp(post_list[i].cmd, name) == 0)
 				break;
 		}
 

@@ -396,7 +392,7 @@ static int post_info_single(struct post_test *test, int full)
 	}
 }
 
-int post_info (char *name)
+int post_info(char *name)
 {
 	unsigned int i;
 

@@ -407,15 +403,14 @@ int post_info (char *name)
 		return 0;
 	} else {
 		for (i = 0; i < post_list_size; i++) {
-			if (strcmp (post_list[i].cmd, name) == 0)
+			if (strcmp(post_list[i].cmd, name) == 0)
 				break;
 		}
 
-		if (i < post_list_size) {
+		if (i < post_list_size)
 			return post_info_single(post_list + i, 1);
-		} else {
+		else
 			return -1;
-		}
 	}
 }
 

@@ -425,13 +420,13 @@ int post_log(char *format, ...)
 	uint i;
 	char printbuffer[CONFIG_SYS_PBSIZE];
 
-	va_start (args, format);
+	va_start(args, format);
 
 	/* For this to work, printbuffer must be larger than
 	 * anything we ever want to print.
 	 */
-	i = vsprintf (printbuffer, format, args);
-	va_end (args);
+	i = vsprintf(printbuffer, format, args);
+	va_end(args);
 
 #ifdef CONFIG_LOGBUFFER
 	/* Send to the logbuffer */

@@ -457,32 +452,32 @@ void post_reloc(void)
 		struct post_test *test = post_list + i;
 
 		if (test->name) {
-			addr = (ulong) (test->name) + gd->reloc_off;
+			addr = (ulong)(test->name) + gd->reloc_off;
 			test->name = (char *)addr;
 		}
 
 		if (test->cmd) {
-			addr = (ulong) (test->cmd) + gd->reloc_off;
+			addr = (ulong)(test->cmd) + gd->reloc_off;
 			test->cmd = (char *)addr;
 		}
 
 		if (test->desc) {
-			addr = (ulong) (test->desc) + gd->reloc_off;
+			addr = (ulong)(test->desc) + gd->reloc_off;
 			test->desc = (char *)addr;
 		}
 
 		if (test->test) {
-			addr = (ulong) (test->test) + gd->reloc_off;
+			addr = (ulong)(test->test) + gd->reloc_off;
 			test->test = (int (*)(int flags)) addr;
 		}
 
 		if (test->init_f) {
-			addr = (ulong) (test->init_f) + gd->reloc_off;
+			addr = (ulong)(test->init_f) + gd->reloc_off;
 			test->init_f = (int (*)(void)) addr;
 		}
 
 		if (test->reloc) {
-			addr = (ulong) (test->reloc) + gd->reloc_off;
+			addr = (ulong)(test->reloc) + gd->reloc_off;
 			test->reloc = (void (*)(void)) addr;
 
 			test->reloc();
Signature · 1 line
1.7.6.4
author Applied
#1 lore raw

PATCH 1/2 post/post.c: CodingStyle cleanup

Dear Wolfgang Denk,

Quoted 6 lines · In message <[email protected]> you wrote:

Make checkpatch-clean..

Signed-off-by Wolfgang Denk <[email protected]>
---
 post/post.c |   59 +++++++++++++++++++++++++++--------------------------------
 1 files changed, 27 insertions(+), 32 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Women professionals do tend to over-compensate.
	-- Dr. Elizabeth Dehaver, "Where No Man Has Gone Before",
	   stardate 1312.9.
#2 lore raw

PATCH 1/2 post/post.c: CodingStyle cleanup

In reply to Wolfgang Denk
Quoted 8 lines

Make checkpatch-clean..

Signed-off-by Wolfgang Denk <[email protected]>
---
 post/post.c |   59

+++++++++++++++++++++++++++-------------------------------- 1 files changed, 27 insertions(+), 32 deletions(-)

[...]

Quoted 17 lines
post/post.c +3 -3
 		if (test->cmd) {
-			addr = (ulong) (test->cmd) + gd->reloc_off;
+			addr = (ulong)(test->cmd) + gd->reloc_off;
 			test->cmd = (char *)addr;
 		}
 
 		if (test->desc) {
-			addr = (ulong) (test->desc) + gd->reloc_off;
+			addr = (ulong)(test->desc) + gd->reloc_off;
 			test->desc = (char *)addr;
 		}
 
 		if (test->test) {
-			addr = (ulong) (test->test) + gd->reloc_off;
+			addr = (ulong)(test->test) + gd->reloc_off;
 			test->test = (int (*)(int flags)) addr;
 		}

post/post.c void post_reloc(void) · line 480

Quoted 10 lines
post/post.c +2 -2
 
 		if (test->init_f) {
-			addr = (ulong) (test->init_f) + gd->reloc_off;
+			addr = (ulong)(test->init_f) + gd->reloc_off;
 			test->init_f = (int (*)(void)) addr;
 		}
 
 		if (test->reloc) {
-			addr = (ulong) (test->reloc) + gd->reloc_off;
+			addr = (ulong)(test->reloc) + gd->reloc_off;

The cast here doesn't seem right maybe ? :-(

Cheers

author
#3 lore raw

PATCH 1/2 post/post.c: CodingStyle cleanup

Dear Marek Vasut,

Quoted 34 lines · In message <[email protected]> you wrote:
Quoted 7 lines
Signed-off-by Wolfgang Denk <[email protected]>
---
 post/post.c |   59

+++++++++++++++++++++++++++-------------------------------- 1 files changed, 27 insertions(+), 32 deletions(-)

[...]

Quoted 24 lines
post/post.c +4 -4
 		if (test->cmd) {
-			addr = (ulong) (test->cmd) + gd->reloc_off;
+			addr = (ulong)(test->cmd) + gd->reloc_off;
 			test->cmd = (char *)addr;
 		}
 
 		if (test->desc) {
-			addr = (ulong) (test->desc) + gd->reloc_off;
+			addr = (ulong)(test->desc) + gd->reloc_off;
 			test->desc = (char *)addr;
 		}
 
 		if (test->test) {
-			addr = (ulong) (test->test) + gd->reloc_off;
+			addr = (ulong)(test->test) + gd->reloc_off;
 			test->test = (int (*)(int flags)) addr;
 		}
 
 		if (test->init_f) {
-			addr = (ulong) (test->init_f) + gd->reloc_off;
+			addr = (ulong)(test->init_f) + gd->reloc_off;
 			test->init_f = (int (*)(void)) addr;
 		}
Quoted 5 lines

post/post.c void post_reloc(void) · line 480

Quoted 3 lines
post/post.c +1 -1
 		if (test->reloc) {
-			addr = (ulong) (test->reloc) + gd->reloc_off;
+			addr = (ulong)(test->reloc) + gd->reloc_off;

The cast here doesn't seem right maybe ? :-(

Why not?

BTW: this is only a CodingStyle cleanup without any changes of the logic.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Don't tell me how hard you work.  Tell me how much you get done.
                                                     -- James J. Ling
#4 lore raw

PATCH 1/2 post/post.c: CodingStyle cleanup

Quoted 56 lines

Dear Marek Vasut,

Quoted 44 lines · In message <[email protected]> you wrote:
Quoted 7 lines
Signed-off-by Wolfgang Denk <[email protected]>

---

 post/post.c |   59

+++++++++++++++++++++++++++-------------------------------- 1 files changed, 27 insertions(+), 32 deletions(-)

[...]

Quoted 34 lines
(quoted diff) +4 -4
 		if (test->cmd) {
 
-			addr = (ulong) (test->cmd) + gd->reloc_off;
+			addr = (ulong)(test->cmd) + gd->reloc_off;
 
 			test->cmd = (char *)addr;
 
 		}
 
 		if (test->desc) {
 
-			addr = (ulong) (test->desc) + gd->reloc_off;
+			addr = (ulong)(test->desc) + gd->reloc_off;
 
 			test->desc = (char *)addr;
 
 		}
 
 		if (test->test) {
 
-			addr = (ulong) (test->test) + gd->reloc_off;
+			addr = (ulong)(test->test) + gd->reloc_off;
 
 			test->test = (int (*)(int flags)) addr;
 
 		}
 
 		if (test->init_f) {
 
-			addr = (ulong) (test->init_f) + gd->reloc_off;
+			addr = (ulong)(test->init_f) + gd->reloc_off;
 
 			test->init_f = (int (*)(void)) addr;
Quoted 8 lines

post/post.c void post_reloc(void) · line 480

Quoted 6 lines
post/post.c +1 -1
 		}
 
 		if (test->reloc) {
 
-			addr = (ulong) (test->reloc) + gd->reloc_off;
+			addr = (ulong)(test->reloc) + gd->reloc_off;

The cast here doesn't seem right maybe ? :-(

Quoted 8 lines

Why not?

BTW: this is only a CodingStyle cleanup without any changes of the logic.

Best regards,

Wolfgang Denk

Ok! Add my:

Acked-by Marek Vasut <[email protected]>
author
#5 lore raw

PATCH 2/2 post/post.c: fix GCC 4.6 build warnings

In reply to Wolfgang Denk

Fix:
post.c: In function 'post_log':
post.c:425:7: warning: variable 'i' set but not used [-Wunused-but-set-variable]

Signed-off-by Wolfgang Denk <[email protected]>
---
 post/post.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
post/post.c +1 -2
index ab8e959..0e67ad7 100644
@@ -417,7 +417,6 @@ int post_info(char *name)
 int post_log(char *format, ...)
 {
 	va_list args;
-	uint i;
 	char printbuffer[CONFIG_SYS_PBSIZE];
 
 	va_start(args, format);

@@ -425,7 +424,7 @@ int post_log(char *format, ...)
 	/* For this to work, printbuffer must be larger than
 	 * anything we ever want to print.
 	 */
-	i = vsprintf(printbuffer, format, args);
+	vsprintf(printbuffer, format, args);
 	va_end(args);
 
 #ifdef CONFIG_LOGBUFFER
Signature · 1 line
1.7.6.4
author Applied
#6 lore raw

PATCH 2/2 post/post.c: fix GCC 4.6 build warnings

Dear Wolfgang Denk,

Quoted 9 lines · In message <[email protected]> you wrote:

Fix:
post.c: In function 'post_log':
post.c:425:7: warning: variable 'i' set but not used [-Wunused-but-set-variable]

Signed-off-by Wolfgang Denk <[email protected]>
---
 post/post.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Perl already has an IDE.  It's called Unix.
                      -- Tom Christiansen in 375bd509 at cs.colorado.edu