diff options
| author | Kelsey Skunberg <skunberg.kelsey@gmail.com> | 2019-07-21 20:35:30 -0600 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-09-02 22:52:50 +0200 |
| commit | e88c7409c983fb611f783918c270cd18c11a6c50 (patch) | |
| tree | d688ba2536799dda6ae52c8a4b8afc71365cb16a /drivers/acpi | |
| parent | 85a5f06773c85f8ec5030ed65e5fa3190b3f16bd (diff) | |
| download | linux-stable-e88c7409c983fb611f783918c270cd18c11a6c50.tar.gz linux-stable-e88c7409c983fb611f783918c270cd18c11a6c50.tar.bz2 linux-stable-e88c7409c983fb611f783918c270cd18c11a6c50.zip | |
ACPI: thermal: Remove redundant acpi_has_method() calls
The following acpi_has_method() calls are unnecessary since
acpi_execute_simple_method() and acpi_evaluate_reference() will
return an error if the given method does not exist.
Remove acpi_has_method() calls to avoid additional work.
Signed-off-by: Kelsey Skunberg <skunberg.kelsey@gmail.com>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 00f12a86ecbd..d831a61e0010 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -225,13 +225,9 @@ static int acpi_thermal_set_cooling_mode(struct acpi_thermal *tz, int mode) if (!tz) return -EINVAL; - if (!acpi_has_method(tz->device->handle, "_SCP")) { - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "_SCP not present\n")); + if (ACPI_FAILURE(acpi_execute_simple_method(tz->device->handle, + "_SCP", mode))) return -ENODEV; - } else if (ACPI_FAILURE(acpi_execute_simple_method(tz->device->handle, - "_SCP", mode))) { - return -ENODEV; - } return 0; } @@ -463,8 +459,7 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) break; } - if ((flag & ACPI_TRIPS_DEVICES) - && acpi_has_method(tz->device->handle, "_TZD")) { + if (flag & ACPI_TRIPS_DEVICES) { memset(&devices, 0, sizeof(devices)); status = acpi_evaluate_reference(tz->device->handle, "_TZD", NULL, &devices); |