From: Wolfgang Denk <wd@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V2] bedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.
Date: Thu, 19 Aug 2010 00:27:33 +0200 [thread overview]
Message-ID: <1282170453-16794-1-git-send-email-wd@denx.de> (raw)
In-Reply-To: <1282157607-2619-1-git-send-email-wd@denx.de>
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>
---
Changes since V1: fix other occurrences of the same issue, too.
arch/powerpc/cpu/mpc8260/bedbug_603e.c | 12 ++++++++----
arch/powerpc/cpu/mpc8xx/bedbug_860.c | 12 ++++++++----
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@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;
--
1.7.2.1
next prev parent reply other threads:[~2010-08-18 22:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-18 18:53 [U-Boot] [PATCH] bedbug_860.c: Fix return type to silence compile warnings Wolfgang Denk
2010-08-18 22:27 ` Wolfgang Denk [this message]
2010-09-08 20:03 ` [U-Boot] [PATCH V2] bedbug_860.c, bedbug_603e.c: " Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282170453-16794-1-git-send-email-wd@denx.de \
--to=wd@denx.de \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox