]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
usb: Drop unused code in usb_kbd.c
authorSimon Glass <sjg@chromium.org>
Mon, 9 Nov 2015 06:48:03 +0000 (23:48 -0700)
committerSimon Glass <sjg@chromium.org>
Fri, 20 Nov 2015 03:27:52 +0000 (20:27 -0700)
This was missed in the conversion to driver model.

Signed-off-by: Simon Glass <sjg@chromium.org>
common/usb_kbd.c

index 5a90f843f2a83149448957b51371529678b9ce16..1d85212af92c378bbeb27c9047d1a8288b423a5a 100644 (file)
@@ -541,35 +541,6 @@ int drv_usb_kbd_init(void)
        int error, i;
 
        debug("%s: Probing for keyboard\n", __func__);
-#ifdef CONFIG_DM_USB
-       /*
-        * TODO: We should add U_BOOT_USB_DEVICE() declarations to each USB
-        * keyboard driver and then most of this file can be removed.
-        */
-       struct udevice *bus;
-       struct uclass *uc;
-       int ret;
-
-       ret = uclass_get(UCLASS_USB, &uc);
-       if (ret)
-               return ret;
-       uclass_foreach_dev(bus, uc) {
-               for (i = 0; i < USB_MAX_DEVICE; i++) {
-                       struct usb_device *dev;
-
-                       dev = usb_get_dev_index(bus, i); /* get device */
-                       debug("i=%d, %p\n", i, dev);
-                       if (!dev)
-                               break; /* no more devices available */
-
-                       error = probe_usb_keyboard(dev);
-                       if (!error)
-                               return 1;
-                       if (error && error != -ENOENT)
-                               return error;
-               } /* for */
-       }
-#else
        /* Scan all USB Devices */
        for (i = 0; i < USB_MAX_DEVICE; i++) {
                struct usb_device *dev;
@@ -588,7 +559,6 @@ int drv_usb_kbd_init(void)
                if (error && error != -ENOENT)
                        return error;
        }
-#endif
 
        /* No USB Keyboard found */
        return -1;