ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()

[ Upstream commit 0a627b28955c93bf437a130796fb07077c3cd843 ]

The reason for clearing boot_ec_is_ecdt in acpi_ec_add() (if a
PNP0C09 device object matching the ECDT boot EC had been found in
the namespace) was to cause acpi_ec_ecdt_start() to return early,
but since the latter does not look at boot_ec_is_ecdt any more,
acpi_ec_add() need not clear it.

Moreover, doing that may be confusing as it may cause "DSDT" to be
printed instead of "ECDT" in the EC initialization completion
message, so stop doing it.

While at it, split the EC initialization completion message into
two messages, one regarding the boot EC and another one printed
regardless of whether or not the EC at hand is the boot one.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index ca5cdb621c2a7766e3ba01f21af11e19527eca2c..2dba4e7a83b76e02caca2ca02628f74e41bba32d 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1573,7 +1573,6 @@ static int acpi_ec_add(struct acpi_device *device)
 
                if (boot_ec && ec->command_addr == boot_ec->command_addr &&
                    ec->data_addr == boot_ec->data_addr) {
-                       boot_ec_is_ecdt = false;
                        /*
                         * Trust PNP0C09 namespace location rather than
                         * ECDT ID. But trust ECDT GPE rather than _GPE
@@ -1593,9 +1592,12 @@ static int acpi_ec_add(struct acpi_device *device)
 
        if (ec == boot_ec)
                acpi_handle_info(boot_ec->handle,
-                                "Boot %s EC used to handle transactions and events\n",
+                                "Boot %s EC initialization complete\n",
                                 boot_ec_is_ecdt ? "ECDT" : "DSDT");
 
+       acpi_handle_info(ec->handle,
+                        "EC: Used to handle transactions and events\n");
+
        device->driver_data = ec;
 
        ret = !!request_region(ec->data_addr, 1, "EC data");