summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKelsey Skunberg <skunberg.kelsey@gmail.com>2019-07-21 21:11:58 -0600
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>2019-07-30 14:12:51 +0300
commitbad9da86f9f10a2e68a1574dd34edde6f8556d5f (patch)
tree82b529258d9d5179e7dcc73ea7e1e07113e4d89a /drivers
parent5599e98fe06a88db55133ae8ac53f69216b82c6a (diff)
platform/x86: wmi: Remove acpi_has_method() call
acpi_has_method() is unnecessary within __query_block() and should be removed to avoid extra work. wc_status is initialized to AE_ERROR before the acpi_has_method() call. acpi_has_method() and acpi_execute_simple_method() failing due to the method not existing will result in the same outcome from __query_block(). Signed-off-by: Kelsey Skunberg <skunberg.kelsey@gmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/x86/wmi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 784cea8572c2..59e9aa0f9643 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -340,9 +340,7 @@ static acpi_status __query_block(struct wmi_block *wblock, u8 instance,
* expensive, but have no corresponding WCxx method. So we
* should not fail if this happens.
*/
- if (acpi_has_method(handle, wc_method))
- wc_status = acpi_execute_simple_method(handle,
- wc_method, 1);
+ wc_status = acpi_execute_simple_method(handle, wc_method, 1);
}
strcpy(method, "WQ");