diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-06 00:15:24 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-03-14 11:04:17 +0100 |
| commit | 65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f (patch) | |
| tree | a6281ebdd2726c74f1c6eaca4ae3a34a35997675 /drivers/acpi | |
| parent | ACPI: EC: Simplify acpi_ec_ecdt_start() and acpi_ec_init() (diff) | |
| download | linux-65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f.tar.xz linux-65a691f5f8f0bb63d6a82eec7b0ffd193d8d8a5f.zip | |
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 <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/ec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 9e7ee6ae4706..8025a070335e 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1621,7 +1621,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 @@ -1641,9 +1640,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"); |