diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-05 17:05:55 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-23 19:40:45 -0400 |
commit | c8678473609b0271ffa0963af82e575312e882cb (patch) | |
tree | fccb2b94fd5225e34820e085e917132da830e574 /include/linux/acpi.h | |
parent | b938a229c85a567de7dba2d806d9f63a7c90483e (diff) |
ACPI: Tidy acpi_run_osc() declarations
Move the acpi_run_osc() prototype next to the related structure and
update comments. No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r-- | include/linux/acpi.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d220d1465d9b..a2f501c0a4f4 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -294,12 +294,14 @@ void __init acpi_nvs_nosave_s3(void); | |||
294 | #endif /* CONFIG_PM_SLEEP */ | 294 | #endif /* CONFIG_PM_SLEEP */ |
295 | 295 | ||
296 | struct acpi_osc_context { | 296 | struct acpi_osc_context { |
297 | char *uuid_str; /* uuid string */ | 297 | char *uuid_str; /* UUID string */ |
298 | int rev; | 298 | int rev; |
299 | struct acpi_buffer cap; /* arg2/arg3 */ | 299 | struct acpi_buffer cap; /* list of DWORD capabilities */ |
300 | struct acpi_buffer ret; /* free by caller if success */ | 300 | struct acpi_buffer ret; /* free by caller if success */ |
301 | }; | 301 | }; |
302 | 302 | ||
303 | acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); | ||
304 | |||
303 | /* Indexes into _OSC Capabilities Buffer (DWORDs 2 & 3 are device-specific) */ | 305 | /* Indexes into _OSC Capabilities Buffer (DWORDs 2 & 3 are device-specific) */ |
304 | #define OSC_QUERY_DWORD 0 /* DWORD 1 */ | 306 | #define OSC_QUERY_DWORD 0 /* DWORD 1 */ |
305 | #define OSC_SUPPORT_DWORD 1 /* DWORD 2 */ | 307 | #define OSC_SUPPORT_DWORD 1 /* DWORD 2 */ |
@@ -312,8 +314,6 @@ struct acpi_osc_context { | |||
312 | #define OSC_INVALID_REVISION_ERROR 0x00000008 /* return */ | 314 | #define OSC_INVALID_REVISION_ERROR 0x00000008 /* return */ |
313 | #define OSC_CAPABILITIES_MASK_ERROR 0x00000010 /* return */ | 315 | #define OSC_CAPABILITIES_MASK_ERROR 0x00000010 /* return */ |
314 | 316 | ||
315 | acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); | ||
316 | |||
317 | /* Platform-Wide Capabilities _OSC: Capabilities DWORD 2: Support Field */ | 317 | /* Platform-Wide Capabilities _OSC: Capabilities DWORD 2: Support Field */ |
318 | #define OSC_SB_PAD_SUPPORT 0x00000001 | 318 | #define OSC_SB_PAD_SUPPORT 0x00000001 |
319 | #define OSC_SB_PPC_OST_SUPPORT 0x00000002 | 319 | #define OSC_SB_PPC_OST_SUPPORT 0x00000002 |