tty: serial: earlycon: use console_is_registered()

It is not reliable to check for CON_ENABLED in order to identify if a
console is registered. Use console_is_registered() instead.

Signed-off-by: John Ogness <john.ogness@linutronix.de>
Reviewed-by: Petr Mladek <pmladek@suse.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20221116162152.193147-27-john.ogness@linutronix.de

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index a5f380584cdae7a1835495eb6e4fc7d6bd003783..4f6e9bf57169eb23cf3bc9e9f84d6a51998b7803 100644 (file)
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -181,7 +181,7 @@ int __init setup_earlycon(char *buf)
        if (!buf || !buf[0])
                return -EINVAL;
 
-       if (early_con.flags & CON_ENABLED)
+       if (console_is_registered(&early_con))
                return -EALREADY;
 
 again:
@@ -253,7 +253,7 @@ int __init of_setup_earlycon(const struct earlycon_id *match,
        bool big_endian;
        u64 addr;
 
-       if (early_con.flags & CON_ENABLED)
+       if (console_is_registered(&early_con))
                return -EALREADY;
 
        spin_lock_init(&port->lock);