Revert "ACPI: Suppress misleading SPCR console message when SPCR table is absent"

commit eeb8c19896952e18fb538ec76e603884070a6c6a upstream.

This reverts commit bad3fa2fb9206f4dcec6ddef094ec2fbf6e8dcb2.

Commit bad3fa2fb920 ("ACPI: Suppress misleading SPCR console message
when SPCR table is absent") mistakenly assumes acpi_parse_spcr()
returning 0 to indicate a failure to parse SPCR. While addressing the
resultant incorrect logging it was deemed that dropping the message is
a better approach as it is not particularly useful.

Roll back the commit introducing the bug as a step towards dropping
the log message.

Link: https://lore.kernel.org/all/aQN0YWUYaPYWpgJM@willie-the-truck/
Signed-off-by: Punit Agrawal <punit.agrawal@oss.qualcomm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index 4d529ff7ba513a5b422fedef5720cdb80829e547..b9a66fc146c9fa66a85ebc4247fcdf0d15dba761 100644 (file)
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -197,8 +197,6 @@ out:
  */
 void __init acpi_boot_table_init(void)
 {
-       int ret;
-
        /*
         * Enable ACPI instead of device tree unless
         * - ACPI has been disabled explicitly (acpi=off), or
@@ -252,12 +250,10 @@ done:
                 * behaviour, use acpi=nospcr to disable console in ACPI SPCR
                 * table as default serial console.
                 */
-               ret = acpi_parse_spcr(earlycon_acpi_spcr_enable,
+               acpi_parse_spcr(earlycon_acpi_spcr_enable,
                        !param_acpi_nospcr);
-               if (!ret || param_acpi_nospcr || !IS_ENABLED(CONFIG_ACPI_SPCR_TABLE))
-                       pr_info("Use ACPI SPCR as default console: No\n");
-               else
-                       pr_info("Use ACPI SPCR as default console: Yes\n");
+               pr_info("Use ACPI SPCR as default console: %s\n",
+                               param_acpi_nospcr ? "No" : "Yes");
 
                if (IS_ENABLED(CONFIG_ACPI_BGRT))
                        acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);