Merge branch 'master' into next

[platform/kernel/u-boot.git] / common / cmd_portio.c

diff --git a/common/cmd_portio.c b/common/cmd_portio.c
index ad84b81..f8befee 100644 (file)
--- a/common/cmd_portio.c
+++ b/common/cmd_portio.c
@@ -30,10 +30,6 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_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.
  */
@@ -48,7 +44,7 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        uint value = out_last_value;
 
        if (argc != 3) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -95,10 +91,10 @@ int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-cmd_tbl_t U_BOOT_CMD(PORTIO_OUT) = MK_CMD_ENTRY(
-       "out",  3,      1,      do_portio_out,
-       "out     - write datum to IO port\n",
-       "[.b, .w, .l] port value\n    - output to IO port\n"
+U_BOOT_CMD(
+       out,    3,      1,      do_portio_out,
+       "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[])
@@ -107,7 +103,7 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        uint size = in_last_size;
 
        if (argc != 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -159,11 +155,9 @@ int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-cmd_tbl_t U_BOOT_CMD(PORTIO_IN) = MK_CMD_ENTRY(
-       "in",   2,      1,      do_portio_in,
-       "in      - read data from an IO port\n",
+U_BOOT_CMD(
+       in,     2,      1,      do_portio_in,
+       "read data from an IO port",
        "[.b, .w, .l] port\n"
-       "    - read datum from IO port\n"
+       "    - read datum from IO port"
 );
-
-#endif /* CFG_CMD_PORTIO */