1 files changed, 22 insertions, 16 deletions

diff --git a/drivers/acpi/events/evgpe.c b/drivers/acpi/events/evgpe.c
index b2f232df13d8..353b907edbfa 100644
--- a/drivers/acpi/events/evgpe.c
+++ b/drivers/acpi/events/evgpe.c
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -372,14 +372,14 @@ struct acpi_gpe_event_info *acpi_ev_get_gpe_event_info(acpi_handle gpe_device,
 
 u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
 {
+        acpi_status status;
+        struct acpi_gpe_block_info *gpe_block;
+        struct acpi_gpe_register_info *gpe_register_info;
         u32 int_status = ACPI_INTERRUPT_NOT_HANDLED;
         u8 enabled_status_byte;
-        struct acpi_gpe_register_info *gpe_register_info;
         u32 status_reg;
         u32 enable_reg;
-        u32 flags;
-        acpi_status status;
-        struct acpi_gpe_block_info *gpe_block;
+        acpi_native_uint flags;
         acpi_native_uint i;
         acpi_native_uint j;
 
@@ -599,8 +599,10 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
             ACPI_GPE_EDGE_TRIGGERED) {
                 status = acpi_hw_clear_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n",
+                                           acpi_format_exception(status),
+                                           gpe_number));
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
         }
 
@@ -637,8 +639,8 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                     ACPI_GPE_LEVEL_TRIGGERED) {
                         status = acpi_hw_clear_gpe(gpe_event_info);
                         if (ACPI_FAILURE(status)) {
-                                ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                                return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                                ACPI_REPORT_ERROR(("%s, Unable to clear GPE[%2X]\n", acpi_format_exception(status), gpe_number));
+                                return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                         }
                 }
                 break;
@@ -651,8 +653,10 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  */
                 status = acpi_ev_disable_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
+                                           acpi_format_exception(status),
+                                           gpe_number));
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
 
                 /*
@@ -663,7 +667,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                                                      acpi_ev_asynch_execute_gpe_method,
                                                      gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
+                        ACPI_REPORT_ERROR(("%s, Unable to queue handler for GPE[%2X] - event disabled\n", acpi_format_exception(status), gpe_number));
                 }
                 break;
 
@@ -671,7 +675,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
 
                 /* No handler or method to run! */
 
-                ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: No handler or method for GPE[%2X], disabling event\n", gpe_number));
+                ACPI_REPORT_ERROR(("No handler or method for GPE[%2X], disabling event\n", gpe_number));
 
                 /*
                  * Disable the GPE.  The GPE will remain disabled until the ACPI
@@ -679,13 +683,15 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
                  */
                 status = acpi_ev_disable_gpe(gpe_event_info);
                 if (ACPI_FAILURE(status)) {
-                        ACPI_REPORT_ERROR(("acpi_ev_gpe_dispatch: %s, Unable to disable GPE[%2X]\n", acpi_format_exception(status), gpe_number));
-                        return_VALUE(ACPI_INTERRUPT_NOT_HANDLED);
+                        ACPI_REPORT_ERROR(("%s, Unable to disable GPE[%2X]\n",
+                                           acpi_format_exception(status),
+                                           gpe_number));
+                        return_UINT32(ACPI_INTERRUPT_NOT_HANDLED);
                 }
                 break;
         }
 
-        return_VALUE(ACPI_INTERRUPT_HANDLED);
+        return_UINT32(ACPI_INTERRUPT_HANDLED);
 }
 
 #ifdef ACPI_GPE_NOTIFY_CHECK