OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: EC: Make acpi_ec_ecdt_probe() more straightforward 

Since acpi_ec_ecdt_probe() is called when boot_ec is not set, it
doesn't neeed to take the other possibility into account.

Accordingly, it only needs to set the handle field in the ec object
to ACPI_ROOT_OBJECT, call acpi_ec_setup() and (if that is successful)
set boot_ec to ec and boot_ec_is_ecdt to 'true'.  Make it do so
directly, without calling acpi_config_boot_ec(), and avoid some
pointless checks in the latter.

No intentional functional impact except for a changed message.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Rafael J. Wysocki 2019-02-01 10:58:20 +01:00
parent a9c3076846
commit 1568426c49
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/acpi/ec.c
View File

@ -1907,14 +1907,22 @@ void __init acpi_ec_ecdt_probe(void)
ec->data_addr = ecdt_ptr->data.address; ec->data_addr = ecdt_ptr->data.address;
} }
ec->gpe = ecdt_ptr->gpe; ec->gpe = ecdt_ptr->gpe;
ec->handle = ACPI_ROOT_OBJECT;
/* /*
* At this point, the namespace is not initialized, so do not find * At this point, the namespace is not initialized, so do not find
* the namespace objects, or handle the events. * the namespace objects, or handle the events.
*/ */
ret = acpi_config_boot_ec(ec, ACPI_ROOT_OBJECT, false, true); ret = acpi_ec_setup(ec, false);
if (ret) if (ret) {
acpi_ec_free(ec); acpi_ec_free(ec);
return;
}
boot_ec = ec;
boot_ec_is_ecdt = true;
pr_info("Boot ECDT EC used to handle transactions\n");
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP