At Fri, 10 Feb 2006 22:48:10 -0500,
Dmitry Torokhov wrote:
>
> On Thursday 09 February 2006 03:44, Satoru Takeuchi wrote:
> > + * Disable all wakeup GPEs before enter requested sleep state.
>
> ... entering ...
Oh, sorry. This is fixed one.
Thanks,
Satoru Takeuchi
drivers/acpi/events/evgpeblk.c | 8 ++++----
drivers/acpi/hardware/hwgpe.c | 8 ++++----
drivers/acpi/sleep/wakeup.c | 6 +++---
include/acpi/acpi_bus.h | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
Index: linux-2.6.16-rc2/drivers/acpi/sleep/wakeup.c
===================================================================
--- linux-2.6.16-rc2.orig/drivers/acpi/sleep/wakeup.c 2006-02-13
10:04:16.000000000 +0900
+++ linux-2.6.16-rc2/drivers/acpi/sleep/wakeup.c 2006-02-13
10:10:32.000000000 +0900
@@ -186,11 +186,11 @@
#endif
/*
- * Disable all wakeup GPEs before power off.
- *
+ * Disable all wakeup GPEs before entering requested sleep state.
+ * @sleep_state: ACPI state
* Since acpi_enter_sleep_state() will disable all
* RUNTIME GPEs, we simply mark all GPES that
- * are not enabled for wakeup from S5 as RUNTIME.
+ * are not enabled for wakeup from requested state as RUNTIME.
*/
void acpi_gpe_sleep_prepare(u32 sleep_state)
{
Index: linux-2.6.16-rc2/drivers/acpi/events/evgpeblk.c
===================================================================
--- linux-2.6.16-rc2.orig/drivers/acpi/events/evgpeblk.c 2006-02-13
10:04:16.000000000 +0900
+++ linux-2.6.16-rc2/drivers/acpi/events/evgpeblk.c 2006-02-13
10:04:22.000000000 +0900
@@ -146,7 +146,7 @@
gpe_xrupt_info = acpi_gbl_gpe_xrupt_list_head;
while (gpe_xrupt_info) {
- /* Walk all Gpe Blocks attached to this interrupt level */
+ /* Walk all GPE Blocks attached to this interrupt level */
gpe_block = gpe_xrupt_info->gpe_block_list_head;
while (gpe_block) {
@@ -173,7 +173,7 @@
* FUNCTION: acpi_ev_delete_gpe_handlers
*
* PARAMETERS: gpe_xrupt_info - GPE Interrupt info
- * gpe_block - Gpe Block info
+ * gpe_block - GPE Block info
*
* RETURN: Status
*
@@ -428,7 +428,7 @@
*
* TRUE iff these conditions are true:
* 1) The GPE devices match.
- * 2) The GPE index(number) is within the range of the Gpe Block
+ * 2) The GPE index(number) is within the range of the GPE Block
* associated with the GPE device.
*/
if ((gpe_device == target_gpe_device) &&
@@ -948,7 +948,7 @@
* FUNCTION: acpi_ev_initialize_gpe_block
*
* PARAMETERS: gpe_device - Handle to the parent GPE block
- * gpe_block - Gpe Block info
+ * gpe_block - GPE Block info
*
* RETURN: Status
*
Index: linux-2.6.16-rc2/drivers/acpi/hardware/hwgpe.c
===================================================================
--- linux-2.6.16-rc2.orig/drivers/acpi/hardware/hwgpe.c 2006-02-13
10:04:16.000000000 +0900
+++ linux-2.6.16-rc2/drivers/acpi/hardware/hwgpe.c 2006-02-13
10:04:22.000000000 +0900
@@ -196,7 +196,7 @@
* FUNCTION: acpi_hw_disable_gpe_block
*
* PARAMETERS: gpe_xrupt_info - GPE Interrupt info
- * gpe_block - Gpe Block info
+ * gpe_block - GPE Block info
*
* RETURN: Status
*
@@ -232,7 +232,7 @@
* FUNCTION: acpi_hw_clear_gpe_block
*
* PARAMETERS: gpe_xrupt_info - GPE Interrupt info
- * gpe_block - Gpe Block info
+ * gpe_block - GPE Block info
*
* RETURN: Status
*
@@ -268,7 +268,7 @@
* FUNCTION: acpi_hw_enable_runtime_gpe_block
*
* PARAMETERS: gpe_xrupt_info - GPE Interrupt info
- * gpe_block - Gpe Block info
+ * gpe_block - GPE Block info
*
* RETURN: Status
*
@@ -314,7 +314,7 @@
* FUNCTION: acpi_hw_enable_wakeup_gpe_block
*
* PARAMETERS: gpe_xrupt_info - GPE Interrupt info
- * gpe_block - Gpe Block info
+ * gpe_block - GPE Block info
*
* RETURN: Status
*
Index: linux-2.6.16-rc2/include/acpi/acpi_bus.h
===================================================================
--- linux-2.6.16-rc2.orig/include/acpi/acpi_bus.h 2006-02-13
10:04:16.000000000 +0900
+++ linux-2.6.16-rc2/include/acpi/acpi_bus.h 2006-02-13 10:04:22.000000000
+0900
@@ -269,7 +269,7 @@
struct acpi_device_wakeup {
acpi_handle gpe_device;
- acpi_integer gpe_number;;
+ acpi_integer gpe_number;
acpi_integer sleep_state;
struct acpi_handle_list resources;
struct acpi_device_wakeup_state state;
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
