Skip to content

Commit 65a691f

Browse files
committed
ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()
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 <[email protected]>
1 parent 98ada3c commit 65a691f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

drivers/acpi/ec.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,6 @@ static int acpi_ec_add(struct acpi_device *device)
16211621

16221622
if (boot_ec && ec->command_addr == boot_ec->command_addr &&
16231623
ec->data_addr == boot_ec->data_addr) {
1624-
boot_ec_is_ecdt = false;
16251624
/*
16261625
* Trust PNP0C09 namespace location rather than
16271626
* ECDT ID. But trust ECDT GPE rather than _GPE
@@ -1641,9 +1640,12 @@ static int acpi_ec_add(struct acpi_device *device)
16411640

16421641
if (ec == boot_ec)
16431642
acpi_handle_info(boot_ec->handle,
1644-
"Boot %s EC used to handle transactions and events\n",
1643+
"Boot %s EC initialization complete\n",
16451644
boot_ec_is_ecdt ? "ECDT" : "DSDT");
16461645

1646+
acpi_handle_info(ec->handle,
1647+
"EC: Used to handle transactions and events\n");
1648+
16471649
device->driver_data = ec;
16481650

16491651
ret = !!request_region(ec->data_addr, 1, "EC data");

0 commit comments

Comments
 (0)