cmd_usage(): simplify return code handling

[karo-tx-uboot.git] / common / cmd_vfd.c

diff --git a/common/cmd_vfd.c b/common/cmd_vfd.c
index 5e623a2705377af48f1ee4d2c5d9b0c4b1c550b3..18c14d1f3bc9456eac24618b5492ef910310e022 100644 (file)
--- a/common/cmd_vfd.c
+++ b/common/cmd_vfd.c
@@ -35,7 +35,7 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_VFD)
+#if defined(CONFIG_CMD_VFD)
 
 #include <vfd_logo.h>
 #define VFD_TEST_LOGO_BMPNR 0
@@ -45,14 +45,12 @@ extern int transfer_pic(unsigned char, unsigned char *, int, int);
 
 int trab_vfd (ulong bitmap);
 
-int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong bitmap;
 
-       if (argc != 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc != 2)
+               return cmd_usage(cmdtp);
 
        if (argv[1][0] == '/') {        /* select bitmap by number */
                bitmap = simple_strtoul(argv[1]+1, NULL, 10);
@@ -66,16 +64,15 @@ int do_vfd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(
-       vfd,    2,      0,      do_vfd,
-       "vfd     - load a bitmap to the VFDs on TRAB\n",
-       "/N\n"
-       "    - load bitmap N to the VFDs (N is _decimal_ !!!)\n"
+       vfd,    2,      0,      do_vfd,
+       "load a bitmap to the VFDs on TRAB",
+       "/N\n"
+       "    - load bitmap N to the VFDs (N is _decimal_ !!!)\n"
        "vfd ADDR\n"
-       "    - load bitmap at address ADDR\n"
+       "    - load bitmap at address ADDR"
 );
-#endif /* CFG_CMD_VFD */
+#endif
 
-#ifdef CONFIG_VFD
 int trab_vfd (ulong bitmap)
 {
        uchar *addr;
@@ -103,4 +100,3 @@ int trab_vfd (ulong bitmap)
        transfer_pic(3, addr, VFD_LOGO_HEIGHT, VFD_LOGO_WIDTH);
        return 0;
 }
-#endif /* CONFIG_VFD */