aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/hwsleep.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2012-03-20 21:42:45 -0400
committerLen Brown <len.brown@intel.com>2012-03-22 01:45:53 -0400
commit4efeeecd884de36b77c64489dee7eb7ca4d6bed0 (patch)
treeec068d9914f1be1ec849cf1dd2e59bfaab4ae3d7 /drivers/acpi/acpica/hwsleep.c
parentdd0228e9220b6c8320ffbf64e58fdac041ec0931 (diff)
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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/acpica/hwsleep.c b/drivers/acpi/acpica/hwsleep.c
index b96d41bbc64..aba36349ba4 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)
123 123
124 /* Execute the _GTS method (Going To Sleep) */ 124 /* Execute the _GTS method (Going To Sleep) */
125 125
126 acpi_hw_execute_sleep_method(METHOD_NAME__GTS, sleep_state); 126 acpi_hw_execute_sleep_method(METHOD_PATHNAME__GTS, sleep_state);
127 127
128 /* Get current value of PM1A control */ 128 /* Get current value of PM1A control */
129 129
@@ -279,7 +279,7 @@ acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state)
279 } 279 }
280 } 280 }
281 281
282 acpi_hw_execute_sleep_method(METHOD_NAME__BFS, sleep_state); 282 acpi_hw_execute_sleep_method(METHOD_PATHNAME__BFS, sleep_state);
283 return_ACPI_STATUS(status); 283 return_ACPI_STATUS(status);
284} 284}
285 285
@@ -305,7 +305,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state)
305 /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */ 305 /* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
306 306
307 acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID; 307 acpi_gbl_sleep_type_a = ACPI_SLEEP_TYPE_INVALID;
308 acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WAKING); 308 acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WAKING);
309 309
310 /* 310 /*
311 * GPEs must be enabled before _WAK is called as GPEs 311 * GPEs must be enabled before _WAK is called as GPEs
@@ -329,7 +329,7 @@ acpi_status acpi_hw_legacy_wake(u8 sleep_state)
329 * Now we can execute _WAK, etc. Some machines require that the GPEs 329 * Now we can execute _WAK, etc. Some machines require that the GPEs
330 * are enabled before the wake methods are executed. 330 * are enabled before the wake methods are executed.
331 */ 331 */
332 acpi_hw_execute_sleep_method(METHOD_NAME__WAK, sleep_state); 332 acpi_hw_execute_sleep_method(METHOD_PATHNAME__WAK, sleep_state);
333 333
334 /* 334 /*
335 * Some BIOS code assumes that WAK_STS will be cleared on resume 335 * 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)
361 return_ACPI_STATUS(status); 361 return_ACPI_STATUS(status);
362 } 362 }
363 363
364 acpi_hw_execute_sleep_method(METHOD_NAME__SST, ACPI_SST_WORKING); 364 acpi_hw_execute_sleep_method(METHOD_PATHNAME__SST, ACPI_SST_WORKING);
365 return_ACPI_STATUS(status); 365 return_ACPI_STATUS(status);
366} 366}
367 367