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

[oweals/u-boot.git] / cmd / usb.c

diff --git a/cmd/usb.c b/cmd/usb.c
index 5453c0d4c58de5efb232374064bfb736a1152734..4fa456e318347452785edf5a2239fda63a1a6458 100644 (file)
--- a/cmd/usb.c
+++ b/cmd/usb.c
@@ -571,11 +571,11 @@ static void do_usb_start(void)
                return;
 
        /* Driver model will probe the devices as they are found */
-#ifndef CONFIG_DM_USB
 # ifdef CONFIG_USB_STORAGE
        /* try to recognize storage devices immediately */
        usb_stor_curr_dev = usb_stor_scan(1);
 # endif
+#ifndef CONFIG_DM_USB
 # ifdef CONFIG_USB_KEYBOARD
        drv_usb_kbd_init();
 # endif
@@ -593,39 +593,20 @@ static void do_usb_start(void)
 }
 
 #ifdef CONFIG_DM_USB
-static void show_info(struct udevice *dev)
+static void usb_show_info(struct usb_device *udev)
 {
        struct udevice *child;
-       struct usb_device *udev;
 
-       udev = dev_get_parent_priv(dev);
        usb_display_desc(udev);
        usb_display_config(udev);
-       for (device_find_first_child(dev, &child);
+       for (device_find_first_child(udev->dev, &child);
             child;
             device_find_next_child(&child)) {
-               if (device_active(child))
-                       show_info(child);
-       }
-}
-
-static int usb_device_info(void)
-{
-       struct udevice *bus;
-
-       for (uclass_first_device(UCLASS_USB, &bus);
-            bus;
-            uclass_next_device(&bus)) {
-               struct udevice *hub;
-
-               device_find_first_child(bus, &hub);
-               if (device_get_uclass_id(hub) == UCLASS_USB_HUB &&
-                   device_active(hub)) {
-                       show_info(hub);
+               if (device_active(child)) {
+                       udev = dev_get_parent_priv(child);
+                       usb_show_info(udev);
                }
        }
-
-       return 0;
 }
 #endif
 
@@ -681,7 +662,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        if (strncmp(argv[1], "inf", 3) == 0) {
                if (argc == 2) {
 #ifdef CONFIG_DM_USB
-                       usb_device_info();
+                       usb_for_each_root_dev(usb_show_info);
 #else
                        int d;
                        for (d = 0; d < USB_MAX_DEVICE; d++) {