summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-08-19 00:27:33 +0200
committerWolfgang Denk <wd@denx.de>2010-09-08 22:02:54 +0200
commit40e74c852b76accfe27d832f23ea3020352bc120 (patch)
tree201c98a2afdd6a90332f139cab48bd40dbc0f5e4
parent2df0e6fc6b71448e1752e4ce1d5577d8977f3e5e (diff)
downloadu-boot-imx-40e74c852b76accfe27d832f23ea3020352bc120.zip
u-boot-imx-40e74c852b76accfe27d832f23ea3020352bc120.tar.gz
u-boot-imx-40e74c852b76accfe27d832f23ea3020352bc120.tar.bz2
bedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.
commit 47e26b1b "cmd_usage(): simplify return code handling" caused the following compile warnings: bedbug_860.c: In function 'bedbug860_do_break': bedbug_860.c:73: warning: 'return' with a value, in function returning void bedbug_860.c:121: warning: 'return' with a value, in function returning void Fix the return type. Actually these files could need some cleanup - commands should return proper error codes, and there are coding style issues. => To be fixed later. Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--arch/powerpc/cpu/mpc8260/bedbug_603e.c12
-rw-r--r--arch/powerpc/cpu/mpc8xx/bedbug_860.c12
2 files changed, 16 insertions, 8 deletions
diff --git a/arch/powerpc/cpu/mpc8260/bedbug_603e.c b/arch/powerpc/cpu/mpc8260/bedbug_603e.c
index 89193a3..92f8957 100644
--- a/arch/powerpc/cpu/mpc8260/bedbug_603e.c
+++ b/arch/powerpc/cpu/mpc8260/bedbug_603e.c
@@ -70,8 +70,10 @@ void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
int which_bp; /* Breakpoint number */
/* -------------------------------------------------- */
- if (argc < 2)
- return cmd_usage(cmdtp);
+ if (argc < 2) {
+ cmd_usage(cmdtp);
+ return;
+ }
/* Turn off a breakpoint */
@@ -114,8 +116,10 @@ void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
if(!(( isdigit( argv[ 1 ][ 0 ] )) ||
(( argv[ 1 ][ 0 ] >= 'a' ) && ( argv[ 1 ][ 0 ] <= 'f' )) ||
- (( argv[ 1 ][ 0 ] >= 'A' ) && ( argv[ 1 ][ 0 ] <= 'F' ))))
- return cmd_usage(cmdtp);
+ (( argv[ 1 ][ 0 ] >= 'A' ) && ( argv[ 1 ][ 0 ] <= 'F' )))) {
+ cmd_usage(cmdtp);
+ return;
+ }
addr = simple_strtoul( argv[ 1 ], NULL, 16 );
diff --git a/arch/powerpc/cpu/mpc8xx/bedbug_860.c b/arch/powerpc/cpu/mpc8xx/bedbug_860.c
index 83db035..c0016f7 100644
--- a/arch/powerpc/cpu/mpc8xx/bedbug_860.c
+++ b/arch/powerpc/cpu/mpc8xx/bedbug_860.c
@@ -69,8 +69,10 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
int which_bp; /* Breakpoint number */
/* -------------------------------------------------- */
- if (argc < 2)
- return cmd_usage(cmdtp);
+ if (argc < 2) {
+ cmd_usage(cmdtp);
+ return;
+ }
/* Turn off a breakpoint */
@@ -117,8 +119,10 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
/* Set a breakpoint at the address */
- if( !isdigit( argv[ 1 ][ 0 ]))
- return cmd_usage(cmdtp);
+ if( !isdigit( argv[ 1 ][ 0 ])) {
+ cmd_usage(cmdtp);
+ return;
+ }
addr = simple_strtoul( argv[ 1 ], NULL, 16 ) & 0xfffffffc;