diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-01 12:59:42 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-02-01 13:45:53 +0300 |
| commit | c746b6b67e168f27b04563b0b429aa3e8be27011 (patch) | |
| tree | bd85c72002be6b6294af85ed14b7595e19b33806 | |
| parent | 1568426c491ad7e17a8d9e0e4d3397ee107af899 (diff) | |
| download | linux-c746b6b67e168f27b04563b0b429aa3e8be27011.tar.xz | |
ACPI: EC: Make acpi_ec_dsdt_probe() more straightforward
Since acpi_ec_dsdt_probe() returns early if boot_ec is set, it is
always unset when that function calls acpi_config_boot_ec() (passing
ec->handle as the handle argument to it). Thus it is not really
useful to call acpi_config_boot_ec() at that point. It is sufficient to
call acpi_ec_setup() directly and (if that is successful) set boot_ec,
so make acpi_ec_dsdt_probe() do that and avoid some pointless checks
in acpi_config_boot_ec().
No intentional functional impact except for a changed message.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/ec.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 22b8866aa163..adddb2e3466d 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1768,9 +1768,16 @@ void __init acpi_ec_dsdt_probe(void) * At this point, the GPE is not fully initialized, so do not to * handle the events. */ - ret = acpi_config_boot_ec(ec, ec->handle, false, false); - if (ret) + ret = acpi_ec_setup(ec, false); + if (ret) { acpi_ec_free(ec); + return; + } + + boot_ec = ec; + + acpi_handle_info(ec->handle, + "Boot DSDT EC used to handle transactions\n"); } /* |