From: John Ogness Date: Wed, 16 Nov 2022 16:21:38 +0000 (+0106) Subject: tty: serial: earlycon: use console_is_registered() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6e35d977fa1e2840e40ad6f09deefdf39d8437b4;p=linux.git 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 Reviewed-by: Petr Mladek Signed-off-by: Petr Mladek 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 a5f380584cdae..4f6e9bf57169e 100644 --- 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);