From: Simon Glass <sjg@chromium.org>
Date: Thu, 27 Jul 2017 15:31:03 +0000 (-0600)
Subject: console: Unify the check for a serial console
X-Git-Tag: v2017.09-rc1~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=42f9f915c2b7aeac222c93a7f7085d9838722efc;p=oweals%2Fu-boot.git

console: Unify the check for a serial console

Put the check for whether a console is a serial device in a function so
that we can share the code in the two places that use it.

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

diff --git a/common/console.c b/common/console.c
index 01eef5594f..b7ed9a3b9d 100644
--- a/common/console.c
+++ b/common/console.c
@@ -146,6 +146,21 @@ static int console_setfile(int file, struct stdio_dev * dev)
 	return error;
 }
 
+/**
+ * console_dev_is_serial() - Check if a stdio device is a serial device
+ *
+ * @sdev: Device to check
+ * @return true if this device is a serial device
+ */
+static bool console_dev_is_serial(struct stdio_dev *sdev)
+{
+	bool is_serial;
+
+	is_serial = !strcmp(sdev->name, "serial");
+
+	return is_serial;
+}
+
 #if CONFIG_IS_ENABLED(CONSOLE_MUX)
 /** Console I/O multiplexing *******************************************/
 
@@ -210,7 +225,7 @@ static void console_puts_noserial(int file, const char *s)
 
 	for (i = 0; i < cd_count[file]; i++) {
 		dev = console_devices[file][i];
-		if (dev->puts != NULL && strcmp(dev->name, "serial") != 0)
+		if (dev->puts != NULL && !console_dev_is_serial(dev))
 			dev->puts(dev, s);
 	}
 }
@@ -249,7 +264,7 @@ static inline void console_putc(int file, const char c)
 
 static inline void console_puts_noserial(int file, const char *s)
 {
-	if (strcmp(stdio_devices[file]->name, "serial") != 0)
+	if (!console_dev_is_serial(stdio_devices[file]))
 		stdio_devices[file]->puts(stdio_devices[file], s);
 }