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

[oweals/u-boot.git] / common / cmd_console.c

diff --git a/common/cmd_console.c b/common/cmd_console.c
index 50ddb011cd402d81dd9a6a19efed26f3baf6cb00..f861f8300cee13eb37a354040f2bd5a96f109c6c 100644 (file)
--- a/common/cmd_console.c
+++ b/common/cmd_console.c
@@ -31,14 +31,17 @@
 extern void _do_coninfo (void);
 int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 {
-       int i, l;
+       int l;
+       struct list_head *list = device_get_list();
+       struct list_head *pos;
+       device_t *dev;
 
        /* Scan for valid output and input devices */
 
        puts ("List of available devices:\n");
 
-       for (i = 1; i <= ListNumItems (devlist); i++) {
-               device_t *dev = ListGetPtrToItem (devlist, i);
+       list_for_each(pos, list) {
+               dev = list_entry(pos, device_t, list);
 
                printf ("%-8s %08x %c%c%c ",
                        dev->name,
@@ -62,6 +65,6 @@ int do_coninfo (cmd_tbl_t * cmd, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        coninfo,        3,      1,      do_coninfo,
-       "coninfo - print console devices and information\n",
+       "print console devices and information",
        ""
 );