diff options
| author | Bob Moore <robert.moore@intel.com> | 2012-03-21 02:42:45 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-03-22 06:45:53 +0100 |
| commit | 4efeeecd884de36b77c64489dee7eb7ca4d6bed0 (patch) | |
| tree | ec068d9914f1be1ec849cf1dd2e59bfaab4ae3d7 /drivers/acpi/acpica/hwsleep.c | |
| parent | ACPICA: Update to version 20120215 (diff) | |
| download | linux-4efeeecd884de36b77c64489dee7eb7ca4d6bed0.tar.xz linux-4efeeecd884de36b77c64489dee7eb7ca4d6bed0.zip | |
ACPICA: Clarify METHOD_NAME* defines for full-pathname cases
Changed the METHOD_NAME* defines that define a full pathname to
the method to METHOD_PATHNAME* in order to make it clear that
it is not a simple 4-character ACPI name. Used for the various
sleep/wake methods.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/hwsleep.c')
| -rw-r--r-- | drivers/acpi/acpica/hwsleep.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c index b96d41bbc64e..aba36349ba4d 100644 --- a/drivers/acpi/acpica/hwsleep.c +++ b/drivers/acpi/acpica/hwsleep.c @@ -123,7 +123,7 @@ acpi_status acpi_hw_legacy_sleep(u8 sleep_state) /* Execute the _GTS method (Going To Sleep) */ - acpi_hw_execute_sleep_method(METHOD_NAME__GTS, sleep_state); + acpi_hw_execute_sleep_method(METHOD_PATHNAME__GTS, sleep_state); /* Get current value of PM1A control */ @@ -279,7 +279,7 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state) } } - acpi_hw_execute_sleep_method(METHOD_NAME__BFS, sleep_state); + acpi_hw_execute_sleep_method(METHOD_PATHNAME__BFS, sleep_state); return_ACPI_STATUS(status); } @@ -305,7 +305,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */ acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID; - acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WAKING); + acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WAKING); /* * GPEs must be enabled before _WAK is called as GPEs @@ -329,7 +329,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) * Now we can execute _WAK, etc. Some machines require that the GPEs * are enabled before the wake methods are executed. */ - acpi_hw_execute_sleep_method(METHOD_NAME__WAK, sleep_state); + acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state); /* * Some BIOS code assumes that WAK_STS will be cleared on resume @@ -361,7 +361,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state) return_ACPI_STATUS(status); } - acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WORKING); + acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING); return_ACPI_STATUS(status); } |