Merge branch 'master' of git://git.denx.de/u-boot-video

[J-u-boot.git] / common / cmd_portio.c

diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index bfe33e3a8cbd5f0166dcf4bf29fc4fcd568695b9..eae8f079d6eb23ff70ad293fb3c30c75a7e812d8 100644 (file)
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -30,10 +30,6 @@
 #include <common.h>
 #include <command.h>
 
-#if defined(CONFIG_CMD_PORTIO)
-
-extern int cmd_get_data_size (char *arg, int default_size);
-
 /* Display values from last command.
  * Memory modify remembered values are different from display memory.
  */
@@ -41,19 +37,18 @@ static uint in_last_addr, in_last_size;
 static uint out_last_addr, out_last_size, out_last_value;
 
 
-int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        uint addr = out_last_addr;
        uint size = out_last_size;
        uint value = out_last_value;
 
-       if (argc != 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc != 3)
+               return CMD_RET_USAGE;
 
        if ((flag & CMD_FLAG_REPEAT) == 0) {
-               /* New command specified.  Check for a size specification.
+               /*
+                * New command specified.  Check for a size specification.
                 * Defaults to long if no or incorrect specification.
                 */
                size = cmd_get_data_size (argv[0], 1);
@@ -97,22 +92,21 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        out,    3,      1,      do_portio_out,
-       "out     - write datum to IO port\n",
-       "[.b, .w, .l] port value\n    - output to IO port\n"
+       "write datum to IO port",
+       "[.b, .w, .l] port value\n    - output to IO port"
 );
 
-int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        uint addr = in_last_addr;
        uint size = in_last_size;
 
-       if (argc != 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc != 2)
+               return CMD_RET_USAGE;
 
        if ((flag & CMD_FLAG_REPEAT) == 0) {
-               /* New command specified.  Check for a size specification.
+               /*
+                * New command specified.  Check for a size specification.
                 * Defaults to long if no or incorrect specification.
                 */
                size = cmd_get_data_size (argv[0], 1);
@@ -161,9 +155,7 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        in,     2,      1,      do_portio_in,
-       "in      - read data from an IO port\n",
+       "read data from an IO port",
        "[.b, .w, .l] port\n"
-       "    - read datum from IO port\n"
+       "    - read datum from IO port"
 );
-
-#endif