Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot

[u-boot] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index d2d29cc98f5ed3e8cf7f91f13daa2d6619756df5..8b2fccf9ca46eb0c1f56c61113c72cffa993c11e 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Denis Peter, MPL AG Switzerland
  *
  * Part of this source has been derived from the Linux USB
  * project.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
 #include <console.h>
@@ -515,7 +514,7 @@ static int probe_usb_keyboard(struct usb_device *dev)
        if (error)
                return error;
 
-       stdinname = getenv("stdin");
+       stdinname = env_get("stdin");
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
        error = iomux_doenv(stdin, stdinname);
        if (error)
@@ -582,7 +581,7 @@ int usb_kbd_deregister(int force)
                if (stdio_deregister_dev(dev, force) != 0)
                        return 1;
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
-               if (iomux_doenv(stdin, getenv("stdin")) != 0)
+               if (iomux_doenv(stdin, env_get("stdin")) != 0)
                        return 1;
 #endif
 #ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
@@ -627,7 +626,7 @@ static int usb_kbd_remove(struct udevice *dev)
                goto err;
        }
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
-       if (iomux_doenv(stdin, getenv("stdin"))) {
+       if (iomux_doenv(stdin, env_get("stdin"))) {
                ret = -ENOLINK;
                goto err;
        }