diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-09-02 20:31:49 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-23 19:37:53 -0400 |
commit | b408a054931cdd1274f72fbeb297e3e3c7ce85f8 (patch) | |
tree | 4c06815cae0722b42dc3ffe0dfa31960d59f2c65 /arch/x86/platform/olpc | |
parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) |
olpc_xo15_sci: convert acpi_evaluate_object() to acpi_execute_simple_method()
acpi_execute_simple_method() is a new ACPI API introduced to invoke
an ACPI control method that has single integer parameter and no return value.
Convert acpi_evaluate_object() to acpi_execute_simple_method()
in arch/x86/platform/olpc/olpc-xo15-sci.c
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
CC: Daniel Drake <dsd@laptop.org>
CC: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/platform/olpc')
-rw-r--r-- | arch/x86/platform/olpc/olpc-xo15-sci.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index fef7d0ba7e3a..649a12befba9 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c | |||
@@ -40,16 +40,9 @@ static bool lid_wake_on_close; | |||
40 | */ | 40 | */ |
41 | static int set_lid_wake_behavior(bool wake_on_close) | 41 | static int set_lid_wake_behavior(bool wake_on_close) |
42 | { | 42 | { |
43 | struct acpi_object_list arg_list; | ||
44 | union acpi_object arg; | ||
45 | acpi_status status; | 43 | acpi_status status; |
46 | 44 | ||
47 | arg_list.count = 1; | 45 | status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", wake_on_close); |
48 | arg_list.pointer = &arg; | ||
49 | arg.type = ACPI_TYPE_INTEGER; | ||
50 | arg.integer.value = wake_on_close; | ||
51 | |||
52 | status = acpi_evaluate_object(NULL, "\\_SB.PCI0.LID.LIDW", &arg_list, NULL); | ||
53 | if (ACPI_FAILURE(status)) { | 46 | if (ACPI_FAILURE(status)) { |
54 | pr_warning(PFX "failed to set lid behavior\n"); | 47 | pr_warning(PFX "failed to set lid behavior\n"); |
55 | return 1; | 48 | return 1; |