Commit 54f14c27 authored by Zhang Rui's avatar Zhang Rui Committed by Rafael J. Wysocki

wmi: convert acpi_get_handle() to acpi_has_method()

acpi_has_method() is a new ACPI API introduced to check
the existence of an ACPI control method.

It can be used to replace acpi_get_handle() in the case that
1. the calling function doesn't need the ACPI handle of the control method.
and
2. the calling function doesn't care the reason why the method is unavailable.

Convert acpi_get_handle() to acpi_has_method()
in drivers/platform/x86/wmi.c in this patch.
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e2e19606
...@@ -347,7 +347,7 @@ struct acpi_buffer *out) ...@@ -347,7 +347,7 @@ struct acpi_buffer *out)
{ {
struct guid_block *block = NULL; struct guid_block *block = NULL;
struct wmi_block *wblock = NULL; struct wmi_block *wblock = NULL;
acpi_handle handle, wc_handle; acpi_handle handle;
acpi_status status, wc_status = AE_ERROR; acpi_status status, wc_status = AE_ERROR;
struct acpi_object_list input; struct acpi_object_list input;
union acpi_object wq_params[1]; union acpi_object wq_params[1];
...@@ -387,8 +387,7 @@ struct acpi_buffer *out) ...@@ -387,8 +387,7 @@ struct acpi_buffer *out)
* expensive, but have no corresponding WCxx method. So we * expensive, but have no corresponding WCxx method. So we
* should not fail if this happens. * should not fail if this happens.
*/ */
wc_status = acpi_get_handle(handle, wc_method, &wc_handle); if (acpi_has_method(handle, wc_method))
if (ACPI_SUCCESS(wc_status))
wc_status = acpi_execute_simple_method(handle, wc_status = acpi_execute_simple_method(handle,
wc_method, 1); wc_method, 1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment