imx6q: engicam: Use SPL_LOAD_FIT for MMC boards

[people/ms/u-boot.git] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index d84865fbbe26bb337d9453a86c03d8dbb06ae43d..8cbdba6ac2984fd667e6e7130311249126ca6c78 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -515,8 +515,8 @@ static int probe_usb_keyboard(struct usb_device *dev)
        if (error)
                return error;
 
-       stdinname = getenv("stdin");
-#ifdef CONFIG_CONSOLE_MUX
+       stdinname = env_get("stdin");
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
        error = iomux_doenv(stdin, stdinname);
        if (error)
                return error;
@@ -566,12 +566,11 @@ int drv_usb_kbd_init(void)
        /* No USB Keyboard found */
        return -1;
 }
-#endif
 
 /* Deregister the keyboard. */
 int usb_kbd_deregister(int force)
 {
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
        struct stdio_dev *dev;
        struct usb_device *usb_kbd_dev;
        struct usb_kbd_pdata *data;
@@ -582,8 +581,8 @@ int usb_kbd_deregister(int force)
                data = usb_kbd_dev->privptr;
                if (stdio_deregister_dev(dev, force) != 0)
                        return 1;
-#ifdef CONFIG_CONSOLE_MUX
-               if (iomux_doenv(stdin, getenv("stdin")) != 0)
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
+               if (iomux_doenv(stdin, env_get("stdin")) != 0)
                        return 1;
 #endif
 #ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
@@ -599,16 +598,15 @@ int usb_kbd_deregister(int force)
 #endif
 }
 
+#endif
+
 #ifdef CONFIG_DM_USB
 
 static int usb_kbd_probe(struct udevice *dev)
 {
        struct usb_device *udev = dev_get_parent_priv(dev);
-       int ret;
-
-       ret = probe_usb_keyboard(udev);
 
-       return ret;
+       return probe_usb_keyboard(udev);
 }
 
 static int usb_kbd_remove(struct udevice *dev)
@@ -628,8 +626,8 @@ static int usb_kbd_remove(struct udevice *dev)
                ret = -EPERM;
                goto err;
        }
-#ifdef CONFIG_CONSOLE_MUX
-       if (iomux_doenv(stdin, getenv("stdin"))) {
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
+       if (iomux_doenv(stdin, env_get("stdin"))) {
                ret = -ENOLINK;
                goto err;
        }