1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 4c8b80f1c688..870e84fb6e39 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -197,25 +197,20 @@ int __init setup_earlycon(char *buf)
 }
 
 /*
- * When CONFIG_ACPI_SPCR_TABLE is defined, "earlycon" without parameters in
- * command line does not start DT earlycon immediately, instead it defers
- * starting it until DT/ACPI decision is made.  At that time if ACPI is enabled
- * call parse_spcr(), else call early_init_dt_scan_chosen_stdout()
+ * This defers the initialization of the early console until after ACPI has
+ * been initialized.
  */
-bool earlycon_init_is_deferred __initdata;
+bool earlycon_acpi_spcr_enable __initdata;
 
 /* early_param wrapper for setup_earlycon() */
 static int __init param_setup_earlycon(char *buf)
 {
         int err;
 
-        /*
-         * Just 'earlycon' is a valid param for devicetree earlycons;
-         * don't generate a warning from parse_early_params() in that case
-         */
+        /* Just 'earlycon' is a valid param for devicetree and ACPI SPCR. */
         if (!buf || !buf[0]) {
                 if (IS_ENABLED(CONFIG_ACPI_SPCR_TABLE)) {
-                        earlycon_init_is_deferred = true;
+                        earlycon_acpi_spcr_enable = true;
                         return 0;
                 } else if (!buf) {
                         return early_init_dt_scan_chosen_stdout();