Commit bad9da86 authored Jul 21, 2019 by Kelsey Skunberg Committed by Andy Shevchenko Jul 30, 2019

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>

parent 5599e98f

drivers/platform/x86/wmi.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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");