stdio: Tidy up use of CONFIG_SYS_DEVICE_NULLDEV

Now that this is in Kconfig we can move the logic at the top of the file
to Kconfig, and use if() instead of #if. Update the file with these
changes.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig b/common/Kconfig
index 5a6d0e0e79b792f0195fb65476fb8ecfcdb00fce..8f61aa760249161a2b12fed3de652072f6964839 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -646,6 +646,7 @@ config SPL_SYS_STDIO_DEREGISTER
 
 config SYS_DEVICE_NULLDEV
        bool "Enable a null device for stdio"
+       default y if SPLASH_SCREEN || SYS_STDIO_DEREGISTER
        help
          Enable creation of a "nulldev" stdio device. This allows silent
          operation of the console by setting stdout to "nulldev". Enable

diff --git a/common/stdio.c b/common/stdio.c
index 2119204b9829497ca07fbafa802e6870f1218212..33a795e7bb426d221246c8253a7472bad38dd5a3 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -31,15 +31,6 @@ static struct stdio_dev devs;
 struct stdio_dev *stdio_devices[] = { NULL, NULL, NULL };
 char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
 
-#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
-#define        CONFIG_SYS_DEVICE_NULLDEV       1
-#endif
-
-#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
-#define        CONFIG_SYS_DEVICE_NULLDEV       1
-#endif
-
-#ifdef CONFIG_SYS_DEVICE_NULLDEV
 static void nulldev_putc(struct stdio_dev *dev, const char c)
 {
        /* nulldev is empty! */
@@ -55,7 +46,6 @@ static int nulldev_input(struct stdio_dev *dev)
        /* nulldev is empty! */
        return 0;
 }
-#endif
 
 static void stdio_serial_putc(struct stdio_dev *dev, const char c)
 {
@@ -96,18 +86,18 @@ static void drv_system_init (void)
        dev.tstc = stdio_serial_tstc;
        stdio_register (&dev);
 
-#ifdef CONFIG_SYS_DEVICE_NULLDEV
-       memset (&dev, 0, sizeof (dev));
+       if (CONFIG_IS_ENABLED(SYS_DEVICE_NULLDEV)) {
+               memset(&dev, '\0', sizeof(dev));
 
-       strcpy (dev.name, "nulldev");
-       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
-       dev.putc = nulldev_putc;
-       dev.puts = nulldev_puts;
-       dev.getc = nulldev_input;
-       dev.tstc = nulldev_input;
+               strcpy(dev.name, "nulldev");
+               dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
+               dev.putc = nulldev_putc;
+               dev.puts = nulldev_puts;
+               dev.getc = nulldev_input;
+               dev.tstc = nulldev_input;
 
-       stdio_register (&dev);
-#endif
+               stdio_register(&dev);
+       }
 }
 
 /**************************************************************************