Command usage cleanup

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

diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c
index 84ecf497262b98a39824e026797530d7cefce231..16439ac489c4948fc833bd38e456eea8905f4be2 100644 (file)
--- a/common/cmd_i2c.c
+++ b/common/cmd_i2c.c
@@ -159,7 +159,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        length = i2c_dp_last_length;
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -184,7 +184,7 @@ int do_i2c_md ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        if (argv[2][j] == '.') {
                                alen = argv[2][j+1] - '0';
                                if (alen > 4) {
-                                       printf ("Usage:\n%s\n", cmdtp->usage);
+                                       cmd_usage(cmdtp);
                                        return 1;
                                }
                                break;
@@ -249,7 +249,6 @@ int do_i2c_mm ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return mod_i2c_mem (cmdtp, 1, flag, argc, argv);
 }
 
-
 int do_i2c_nm ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
        return mod_i2c_mem (cmdtp, 0, flag, argc, argv);
@@ -270,7 +269,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     j;
 
        if ((argc < 4) || (argc > 5)) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -288,7 +287,7 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (argv[2][j] == '.') {
                        alen = argv[2][j+1] - '0';
                        if (alen > 4) {
-                               printf ("Usage:\n%s\n", cmdtp->usage);
+                               cmd_usage(cmdtp);
                                return 1;
                        }
                        break;
@@ -339,7 +338,6 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return (0);
 }
 
-
 /* Calculate a CRC on memory
  *
  * Syntax:
@@ -357,7 +355,7 @@ int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     j;
 
        if (argc < 4) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -375,7 +373,7 @@ int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (argv[2][j] == '.') {
                        alen = argv[2][j+1] - '0';
                        if (alen > 4) {
-                               printf ("Usage:\n%s\n", cmdtp->usage);
+                               cmd_usage(cmdtp);
                                return 1;
                        }
                        break;
@@ -409,7 +407,6 @@ int do_i2c_crc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-
 /* Modify memory.
  *
  * Syntax:
@@ -430,7 +427,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
        extern char console_buffer[];
 
        if (argc != 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -466,7 +463,7 @@ mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[])
                        if (argv[2][j] == '.') {
                                alen = argv[2][j+1] - '0';
                                if (alen > 4) {
-                                       printf ("Usage:\n%s\n", cmdtp->usage);
+                                       cmd_usage(cmdtp);
                                        return 1;
                                }
                                break;
@@ -587,7 +584,6 @@ int do_i2c_probe (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-
 /*
  * Syntax:
  *     iloop {i2c_chip} {addr}{.0, .1, .2} [{length}] [{delay}]
@@ -605,7 +601,7 @@ int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int     j;
 
        if (argc < 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -623,7 +619,7 @@ int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                if (argv[2][j] == '.') {
                        alen = argv[2][j+1] - '0';
                        if (alen > 4) {
-                               printf ("Usage:\n%s\n", cmdtp->usage);
+                               cmd_usage(cmdtp);
                                return 1;
                        }
                        break;
@@ -658,7 +654,6 @@ int do_i2c_loop(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-
 /*
  * The SDRAM command is separately configured because many
  * (most?) embedded boards don't use SDRAM DIMMs.
@@ -769,7 +764,7 @@ int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        };
 
        if (argc < 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
        /*
@@ -1298,7 +1293,7 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                return do_sdram(cmdtp, flag, --argc, ++argv);
 #endif
        else
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
        return 0;
 }
 #endif  /* CONFIG_I2C_CMD_TREE */
@@ -1308,7 +1303,7 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 #if defined(CONFIG_I2C_CMD_TREE)
 U_BOOT_CMD(
        i2c, 6, 1, do_i2c,
-       "i2c     - I2C sub-system\n",
+       "I2C sub-system",
 #if defined(CONFIG_I2C_MUX)
        "bus [muxtype:muxaddr:muxchannel] - add a new bus reached over muxes.\n"
 #endif  /* CONFIG_I2C_MUX */
@@ -1331,37 +1326,37 @@ U_BOOT_CMD(
 #endif /* CONFIG_I2C_CMD_TREE */
 U_BOOT_CMD(
        imd,    4,      1,      do_i2c_md,              \
-       "imd     - i2c memory display\n",                               \
+       "i2c memory display",                           \
        "chip address[.0, .1, .2] [# of objects]\n    - i2c memory display\n" \
 );
 
 U_BOOT_CMD(
        imm,    3,      1,      do_i2c_mm,
-       "imm     - i2c memory modify (auto-incrementing)\n",
+       "i2c memory modify (auto-incrementing)",
        "chip address[.0, .1, .2]\n"
        "    - memory modify, auto increment address\n"
 );
 U_BOOT_CMD(
        inm,    3,      1,      do_i2c_nm,
-       "inm     - memory modify (constant address)\n",
+       "memory modify (constant address)",
        "chip address[.0, .1, .2]\n    - memory modify, read and keep address\n"
 );
 
 U_BOOT_CMD(
        imw,    5,      1,      do_i2c_mw,
-       "imw     - memory write (fill)\n",
+       "memory write (fill)",
        "chip address[.0, .1, .2] value [count]\n    - memory write (fill)\n"
 );
 
 U_BOOT_CMD(
        icrc32, 5,      1,      do_i2c_crc,
-       "icrc32  - checksum calculation\n",
+       "checksum calculation",
        "chip address[.0, .1, .2] count\n    - compute CRC32 checksum\n"
 );
 
 U_BOOT_CMD(
        iprobe, 1,      1,      do_i2c_probe,
-       "iprobe  - probe to discover valid I2C chip addresses\n",
+       "probe to discover valid I2C chip addresses",
        "\n    -discover valid I2C chip addresses\n"
 );
 
@@ -1370,7 +1365,7 @@ U_BOOT_CMD(
  */
 U_BOOT_CMD(
        iloop,  5,      1,      do_i2c_loop,
-       "iloop   - infinite loop on address range\n",
+       "infinite loop on address range",
        "chip address[.0, .1, .2] [# of objects]\n"
        "    - loop, reading a set of addresses\n"
 );
@@ -1378,7 +1373,7 @@ U_BOOT_CMD(
 #if defined(CONFIG_CMD_SDRAM)
 U_BOOT_CMD(
        isdram, 2,      1,      do_sdram,
-       "isdram  - print SDRAM configuration information\n",
+       "print SDRAM configuration information",
        "chip\n    - print SDRAM configuration information\n"
        "      (valid chip values 50..57)\n"
 );
@@ -1601,4 +1596,3 @@ int i2x_mux_select_mux(int bus)
        return 0;
 }
 #endif /* CONFIG_I2C_MUX */
-