From patchwork Wed Nov 24 12:38:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 72871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id B96F9B708B for ; Wed, 24 Nov 2010 23:38:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 60DDB28196; Wed, 24 Nov 2010 13:38:52 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qJlS8taxmRe7; Wed, 24 Nov 2010 13:38:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AF4872817E; Wed, 24 Nov 2010 13:38:49 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C84E2817E for ; Wed, 24 Nov 2010 13:38:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U5TFhFukNwbs for ; Wed, 24 Nov 2010 13:38:46 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.9]) by theia.denx.de (Postfix) with ESMTP id 019BB28173 for ; Wed, 24 Nov 2010 13:38:44 +0100 (CET) Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Lmyme-1OnIRb0820-00h3dZ; Wed, 24 Nov 2010 13:38:43 +0100 Received: from Lupus.CS.local (unknown [192.168.102.87]) by corscience.de (Postfix) with ESMTP id CAC7B5209B; Wed, 24 Nov 2010 13:38:41 +0100 (CET) From: Thomas Weber To: u-boot@lists.denx.de Date: Wed, 24 Nov 2010 13:38:14 +0100 Message-Id: <1290602294-17230-1-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.3.2 X-Provags-ID: V02:K0:29hKzsOuYx1CU7AM2OBHI0Rn/+ODl+lDy2BLGVgCKtm H6eoQGNyoYbooKfnRfvsSmHruHY4KvQq6ZprqrS+Zy3nlkiAU9 zL3DADnb2ZcDxqQ2piqJKvMh13sChQUaWRzD1+G8zGm0W0NY1h nqabnOXTbKkU7aaIy+fUNCgpYIiZXukd5Adh4yFIXnXWWwuV3M zj3r8Z7khkiOxSjQNQmPQ== Cc: Thomas Weber Subject: [U-Boot] [PATCH] cmd_usage: Use ignored return value X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de cmd_usage returns 1, so its return value can be used as return value. Some functions ignore the return value of cmd_usage and return a "1" in the next line. This patch changes these calls so that the return value of cmd_usage is used as return value. Signed-off-by: Thomas Weber --- arch/powerpc/cpu/ppc4xx/cmd_ecctest.c | 6 ++---- board/gdsys/common/osd.c | 6 ++---- common/cmd_nvedit.c | 18 ++++++------------ 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c b/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c index fd81b70..542ab69 100644 --- a/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c +++ b/arch/powerpc/cpu/ppc4xx/cmd_ecctest.c @@ -190,15 +190,13 @@ static int do_ecctest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int error; if (argc < 3) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } ptr = (u32 *)simple_strtoul(argv[1], NULL, 16); error = simple_strtoul(argv[2], NULL, 16); if ((error < 1) || (error > 2)) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } printf("Using address %p for %d bit ECC error injection\n", diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c index 05800ff..239c870 100644 --- a/board/gdsys/common/osd.c +++ b/board/gdsys/common/osd.c @@ -142,8 +142,7 @@ static int osd_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *text; if (argc < 5) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } x = simple_strtoul(argv[1], NULL, 16); @@ -204,8 +203,7 @@ int osd_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) unsigned count = (argc > 4) ? simple_strtoul(argv[4], NULL, 16) : 1; if ((argc < 4) || (strlen(argv[3]) % 4)) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } x = simple_strtoul(argv[1], NULL, 16); diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 3fd8abc..cd19cc6 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -545,8 +545,7 @@ int envmatch (uchar *s1, int i2) static int do_env_default(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { if ((argc != 2) || (strcmp(argv[1], "-f") != 0)) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } set_default_env("## Resetting to default environment\n"); return 0; @@ -633,15 +632,13 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv sep = '\n'; break; default: - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } } } if (argc < 1) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } addr = (char *)simple_strtoul(argv[0], NULL, 16); @@ -744,15 +741,13 @@ static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const arg del = 1; break; default: - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } } } if (argc < 1) { - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } if (!fmt) @@ -857,8 +852,7 @@ static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (cp) return cp->cmd(cmdtp, flag, argc, argv); - cmd_usage(cmdtp); - return 1; + return cmd_usage(cmdtp); } U_BOOT_CMD(