console: remove duplicated test on gd value

Reorder test on gd value and remove the duplicated test (!gd)
in putc and puts function.

This patch is a preliminary step for rework of this function.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/console.c b/common/console.c
index 3348436..70579af 100644 (file)
--- a/common/console.c
+++ b/common/console.c
@@ -517,22 +517,22 @@ static inline void print_pre_console_buffer(int flushpoint) {}
 
 void putc(const char c)
 {
+       if (!gd)
+               return;
 #ifdef CONFIG_SANDBOX
        /* sandbox can send characters to stdout before it has a console */
-       if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+       if (!(gd->flags & GD_FLG_SERIAL_READY)) {
                os_putc(c);
                return;
        }
 #endif
 #ifdef CONFIG_DEBUG_UART
        /* if we don't have a console yet, use the debug UART */
-       if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+       if (!(gd->flags & GD_FLG_SERIAL_READY)) {
                printch(c);
                return;
        }
 #endif
-       if (!gd)
-               return;
 #ifdef CONFIG_CONSOLE_RECORD
        if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start)
                membuff_putbyte((struct membuff *)&gd->console_out, c);
@@ -565,15 +565,17 @@ void putc(const char c)
 
 void puts(const char *s)
 {
+       if (!gd)
+               return;
 #ifdef CONFIG_SANDBOX
        /* sandbox can send characters to stdout before it has a console */
-       if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+       if (!(gd->flags & GD_FLG_SERIAL_READY)) {
                os_puts(s);
                return;
        }
 #endif
 #ifdef CONFIG_DEBUG_UART
-       if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+       if (!(gd->flags & GD_FLG_SERIAL_READY)) {
                while (*s) {
                        int ch = *s++;
 
@@ -582,8 +584,6 @@ void puts(const char *s)
                return;
        }
 #endif
-       if (!gd)
-               return;
 #ifdef CONFIG_CONSOLE_RECORD
        if ((gd->flags & GD_FLG_RECORD) && gd->console_out.start)
                membuff_put((struct membuff *)&gd->console_out, s, strlen(s));