Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / drivers / acpi / events / evxfevnt.c
index fa8d5f2..ec9ce84 100644 (file)
@@ -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
@@ -48,8 +48,7 @@
 #include <acpi/acnamesp.h>
 
 #define _COMPONENT          ACPI_EVENTS
-        ACPI_MODULE_NAME    ("evxfevnt")
-
+ACPI_MODULE_NAME("evxfevnt")
 
 /*******************************************************************************
  *
  * DESCRIPTION: Transfers the system into ACPI mode.
  *
  ******************************************************************************/
-
-acpi_status
-acpi_enable (void)
+acpi_status acpi_enable(void)
 {
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_enable");
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE("acpi_enable");
 
-       /* Make sure we have the FADT*/
+       /* Make sure we have the FADT */
 
        if (!acpi_gbl_FADT) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No FADT information present!\n"));
-               return_ACPI_STATUS (AE_NO_ACPI_TABLES);
+               ACPI_WARNING((AE_INFO, "No FADT information present!"));
+               return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
 
        if (acpi_hw_get_mode() == ACPI_SYS_MODE_ACPI) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "System is already in ACPI mode\n"));
-       }
-       else {
+               ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+                                 "System is already in ACPI mode\n"));
+       else {
                /* Transition to ACPI mode */
 
-               status = acpi_hw_set_mode (ACPI_SYS_MODE_ACPI);
-               if (ACPI_FAILURE (status)) {
-                       ACPI_REPORT_ERROR (("Could not transition to ACPI mode.\n"));
-                       return_ACPI_STATUS (status);
+               status = acpi_hw_set_mode(ACPI_SYS_MODE_ACPI);
+               if (ACPI_FAILURE(status)) {
+                       ACPI_ERROR((AE_INFO,
+                                   "Could not transition to ACPI mode"));
+                       return_ACPI_STATUS(status);
                }
 
-               ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "Transition to ACPI mode successful\n"));
+               ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+                                 "Transition to ACPI mode successful\n"));
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_disable
@@ -106,44 +102,41 @@ acpi_enable (void)
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Transfers the system into LEGACY mode.
+ * DESCRIPTION: Transfers the system into LEGACY (non-ACPI) mode.
  *
  ******************************************************************************/
 
-acpi_status
-acpi_disable (void)
+acpi_status acpi_disable(void)
 {
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_disable");
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE("acpi_disable");
 
        if (!acpi_gbl_FADT) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_WARN, "No FADT information present!\n"));
-               return_ACPI_STATUS (AE_NO_ACPI_TABLES);
+               ACPI_WARNING((AE_INFO, "No FADT information present!"));
+               return_ACPI_STATUS(AE_NO_ACPI_TABLES);
        }
 
        if (acpi_hw_get_mode() == ACPI_SYS_MODE_LEGACY) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "System is already in legacy (non-ACPI) mode\n"));
-       }
-       else {
+               ACPI_DEBUG_PRINT((ACPI_DB_INIT,
+                                 "System is already in legacy (non-ACPI) mode\n"));
+       else {
                /* Transition to LEGACY mode */
 
-               status = acpi_hw_set_mode (ACPI_SYS_MODE_LEGACY);
+               status = acpi_hw_set_mode(ACPI_SYS_MODE_LEGACY);
 
-               if (ACPI_FAILURE (status)) {
-                       ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not exit ACPI mode to legacy mode"));
-                       return_ACPI_STATUS (status);
+               if (ACPI_FAILURE(status)) {
+                       ACPI_ERROR((AE_INFO,
+                                   "Could not exit ACPI mode to legacy mode"));
+                       return_ACPI_STATUS(status);
                }
 
-               ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "ACPI mode disabled\n"));
+               ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI mode disabled\n"));
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enable_event
@@ -157,52 +150,50 @@ acpi_disable (void)
  *
  ******************************************************************************/
 
-acpi_status
-acpi_enable_event (
-       u32                             event,
-       u32                             flags)
+acpi_status acpi_enable_event(u32 event, u32 flags)
 {
-       acpi_status                     status = AE_OK;
-       u32                             value;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_enable_event");
+       acpi_status status = AE_OK;
+       u32 value;
 
+       ACPI_FUNCTION_TRACE("acpi_enable_event");
 
        /* Decode the Fixed Event */
 
        if (event > ACPI_EVENT_MAX) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /*
         * Enable the requested fixed event (by writing a one to the
         * enable register bit)
         */
-       status = acpi_set_register (acpi_gbl_fixed_event_info[event].enable_register_id,
-                        1, ACPI_MTX_LOCK);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status =
+           acpi_set_register(acpi_gbl_fixed_event_info[event].
+                             enable_register_id, 1, ACPI_MTX_LOCK);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        /* Make sure that the hardware responded */
 
-       status = acpi_get_register (acpi_gbl_fixed_event_info[event].enable_register_id,
-                         &value, ACPI_MTX_LOCK);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status =
+           acpi_get_register(acpi_gbl_fixed_event_info[event].
+                             enable_register_id, &value, ACPI_MTX_LOCK);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        if (value != 1) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "Could not enable %s event\n", acpi_ut_get_event_name (event)));
-               return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE);
+               ACPI_ERROR((AE_INFO,
+                           "Could not enable %s event",
+                           acpi_ut_get_event_name(event)));
+               return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_enable_event);
 
+EXPORT_SYMBOL(acpi_enable_event);
 
 /*******************************************************************************
  *
@@ -214,44 +205,38 @@ EXPORT_SYMBOL(acpi_enable_event);
  *
  * RETURN:      Status
  *
- * DESCRIPTION: Enable an ACPI event (general purpose)
+ * DESCRIPTION: Set the type of an individual GPE
  *
  ******************************************************************************/
 
-acpi_status
-acpi_set_gpe_type (
-       acpi_handle                     gpe_device,
-       u32                             gpe_number,
-       u8                              type)
+acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
 {
-       acpi_status                     status = AE_OK;
-       struct acpi_gpe_event_info      *gpe_event_info;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_set_gpe_type");
+       acpi_status status = AE_OK;
+       struct acpi_gpe_event_info *gpe_event_info;
 
+       ACPI_FUNCTION_TRACE("acpi_set_gpe_type");
 
        /* Ensure that we have a valid GPE number */
 
-       gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number);
+       gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
        if (!gpe_event_info) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
 
        if ((gpe_event_info->flags & ACPI_GPE_TYPE_MASK) == type) {
-               return_ACPI_STATUS (AE_OK);
+               return_ACPI_STATUS(AE_OK);
        }
 
        /* Set the new type (will disable GPE if currently enabled) */
 
-       status = acpi_ev_set_gpe_type (gpe_event_info, type);
+       status = acpi_ev_set_gpe_type(gpe_event_info, type);
 
-unlock_and_exit:
-       return_ACPI_STATUS (status);
+      unlock_and_exit:
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_set_gpe_type);
 
+EXPORT_SYMBOL(acpi_set_gpe_type);
 
 /*******************************************************************************
  *
@@ -268,31 +253,25 @@ EXPORT_SYMBOL(acpi_set_gpe_type);
  *
  ******************************************************************************/
 
-acpi_status
-acpi_enable_gpe (
-       acpi_handle                     gpe_device,
-       u32                             gpe_number,
-       u32                             flags)
+acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 {
-       acpi_status                     status = AE_OK;
-       struct acpi_gpe_event_info      *gpe_event_info;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_enable_gpe");
+       acpi_status status = AE_OK;
+       struct acpi_gpe_event_info *gpe_event_info;
 
+       ACPI_FUNCTION_TRACE("acpi_enable_gpe");
 
        /* Use semaphore lock if not executing at interrupt level */
 
        if (flags & ACPI_NOT_ISR) {
-               status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
+               status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+               if (ACPI_FAILURE(status)) {
+                       return_ACPI_STATUS(status);
                }
        }
 
        /* Ensure that we have a valid GPE number */
 
-       gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number);
+       gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
        if (!gpe_event_info) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
@@ -300,16 +279,16 @@ acpi_enable_gpe (
 
        /* Perform the enable */
 
-       status = acpi_ev_enable_gpe (gpe_event_info, TRUE);
+       status = acpi_ev_enable_gpe(gpe_event_info, TRUE);
 
-unlock_and_exit:
+      unlock_and_exit:
        if (flags & ACPI_NOT_ISR) {
-               (void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
+               (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        }
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_enable_gpe);
 
+EXPORT_SYMBOL(acpi_enable_gpe);
 
 /*******************************************************************************
  *
@@ -326,46 +305,39 @@ EXPORT_SYMBOL(acpi_enable_gpe);
  *
  ******************************************************************************/
 
-acpi_status
-acpi_disable_gpe (
-       acpi_handle                     gpe_device,
-       u32                             gpe_number,
-       u32                             flags)
+acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 {
-       acpi_status                     status = AE_OK;
-       struct acpi_gpe_event_info      *gpe_event_info;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_disable_gpe");
+       acpi_status status = AE_OK;
+       struct acpi_gpe_event_info *gpe_event_info;
 
+       ACPI_FUNCTION_TRACE("acpi_disable_gpe");
 
        /* Use semaphore lock if not executing at interrupt level */
 
        if (flags & ACPI_NOT_ISR) {
-               status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
+               status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+               if (ACPI_FAILURE(status)) {
+                       return_ACPI_STATUS(status);
                }
        }
 
        /* Ensure that we have a valid GPE number */
 
-       gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number);
+       gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
        if (!gpe_event_info) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
 
-       status = acpi_ev_disable_gpe (gpe_event_info);
+       status = acpi_ev_disable_gpe(gpe_event_info);
 
-unlock_and_exit:
+      unlock_and_exit:
        if (flags & ACPI_NOT_ISR) {
-               (void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
+               (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        }
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_disable_event
@@ -379,50 +351,48 @@ unlock_and_exit:
  *
  ******************************************************************************/
 
-acpi_status
-acpi_disable_event (
-       u32                             event,
-       u32                             flags)
+acpi_status acpi_disable_event(u32 event, u32 flags)
 {
-       acpi_status                     status = AE_OK;
-       u32                             value;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_disable_event");
+       acpi_status status = AE_OK;
+       u32 value;
 
+       ACPI_FUNCTION_TRACE("acpi_disable_event");
 
        /* Decode the Fixed Event */
 
        if (event > ACPI_EVENT_MAX) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /*
         * Disable the requested fixed event (by writing a zero to the
         * enable register bit)
         */
-       status = acpi_set_register (acpi_gbl_fixed_event_info[event].enable_register_id,
-                        0, ACPI_MTX_LOCK);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status =
+           acpi_set_register(acpi_gbl_fixed_event_info[event].
+                             enable_register_id, 0, ACPI_MTX_LOCK);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
-       status = acpi_get_register (acpi_gbl_fixed_event_info[event].enable_register_id,
-                        &value, ACPI_MTX_LOCK);
-       if (ACPI_FAILURE (status)) {
-               return_ACPI_STATUS (status);
+       status =
+           acpi_get_register(acpi_gbl_fixed_event_info[event].
+                             enable_register_id, &value, ACPI_MTX_LOCK);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
        }
 
        if (value != 0) {
-               ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
-                       "Could not disable %s events\n", acpi_ut_get_event_name (event)));
-               return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE);
+               ACPI_ERROR((AE_INFO,
+                           "Could not disable %s events",
+                           acpi_ut_get_event_name(event)));
+               return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
        }
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_disable_event);
 
+EXPORT_SYMBOL(acpi_disable_event);
 
 /*******************************************************************************
  *
@@ -436,33 +406,30 @@ EXPORT_SYMBOL(acpi_disable_event);
  *
  ******************************************************************************/
 
-acpi_status
-acpi_clear_event (
-       u32                             event)
+acpi_status acpi_clear_event(u32 event)
 {
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_clear_event");
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE("acpi_clear_event");
 
        /* Decode the Fixed Event */
 
        if (event > ACPI_EVENT_MAX) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /*
         * Clear the requested fixed event (By writing a one to the
         * status register bit)
         */
-       status = acpi_set_register (acpi_gbl_fixed_event_info[event].status_register_id,
-                       1, ACPI_MTX_LOCK);
+       status =
+           acpi_set_register(acpi_gbl_fixed_event_info[event].
+                             status_register_id, 1, ACPI_MTX_LOCK);
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_clear_event);
 
+EXPORT_SYMBOL(acpi_clear_event);
 
 /*******************************************************************************
  *
@@ -478,54 +445,46 @@ EXPORT_SYMBOL(acpi_clear_event);
  *
  ******************************************************************************/
 
-acpi_status
-acpi_clear_gpe (
-       acpi_handle                     gpe_device,
-       u32                             gpe_number,
-       u32                             flags)
+acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
 {
-       acpi_status                     status = AE_OK;
-       struct acpi_gpe_event_info      *gpe_event_info;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_clear_gpe");
+       acpi_status status = AE_OK;
+       struct acpi_gpe_event_info *gpe_event_info;
 
+       ACPI_FUNCTION_TRACE("acpi_clear_gpe");
 
        /* Use semaphore lock if not executing at interrupt level */
 
        if (flags & ACPI_NOT_ISR) {
-               status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
+               status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+               if (ACPI_FAILURE(status)) {
+                       return_ACPI_STATUS(status);
                }
        }
 
        /* Ensure that we have a valid GPE number */
 
-       gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number);
+       gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
        if (!gpe_event_info) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
 
-       status = acpi_hw_clear_gpe (gpe_event_info);
+       status = acpi_hw_clear_gpe(gpe_event_info);
 
-unlock_and_exit:
+      unlock_and_exit:
        if (flags & ACPI_NOT_ISR) {
-               (void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
+               (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        }
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 #ifdef ACPI_FUTURE_USAGE
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_event_status
  *
  * PARAMETERS:  Event           - The fixed event
- *              Event Status    - Where the current status of the event will
+ *              event_status    - Where the current status of the event will
  *                                be returned
  *
  * RETURN:      Status
@@ -534,36 +493,31 @@ unlock_and_exit:
  *
  ******************************************************************************/
 
-acpi_status
-acpi_get_event_status (
-       u32                             event,
-       acpi_event_status               *event_status)
+acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
 {
-       acpi_status                     status = AE_OK;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_get_event_status");
+       acpi_status status = AE_OK;
 
+       ACPI_FUNCTION_TRACE("acpi_get_event_status");
 
        if (!event_status) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /* Decode the Fixed Event */
 
        if (event > ACPI_EVENT_MAX) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
        /* Get the status of the requested fixed event */
 
-       status = acpi_get_register (acpi_gbl_fixed_event_info[event].status_register_id,
-                         event_status, ACPI_MTX_LOCK);
+       status =
+           acpi_get_register(acpi_gbl_fixed_event_info[event].
+                             status_register_id, event_status, ACPI_MTX_LOCK);
 
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
 
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_gpe_status
@@ -571,7 +525,7 @@ acpi_get_event_status (
  * PARAMETERS:  gpe_device      - Parent GPE Device
  *              gpe_number      - GPE level within the GPE block
  *              Flags           - Called from an ISR or not
- *              Event Status    - Where the current status of the event will
+ *              event_status    - Where the current status of the event will
  *                                be returned
  *
  * RETURN:      Status
@@ -581,31 +535,26 @@ acpi_get_event_status (
  ******************************************************************************/
 
 acpi_status
-acpi_get_gpe_status (
-       acpi_handle                     gpe_device,
-       u32                             gpe_number,
-       u32                             flags,
-       acpi_event_status               *event_status)
+acpi_get_gpe_status(acpi_handle gpe_device,
+                   u32 gpe_number, u32 flags, acpi_event_status * event_status)
 {
-       acpi_status                     status = AE_OK;
-       struct acpi_gpe_event_info      *gpe_event_info;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_get_gpe_status");
+       acpi_status status = AE_OK;
+       struct acpi_gpe_event_info *gpe_event_info;
 
+       ACPI_FUNCTION_TRACE("acpi_get_gpe_status");
 
        /* Use semaphore lock if not executing at interrupt level */
 
        if (flags & ACPI_NOT_ISR) {
-               status = acpi_ut_acquire_mutex (ACPI_MTX_EVENTS);
-               if (ACPI_FAILURE (status)) {
-                       return_ACPI_STATUS (status);
+               status = acpi_ut_acquire_mutex(ACPI_MTX_EVENTS);
+               if (ACPI_FAILURE(status)) {
+                       return_ACPI_STATUS(status);
                }
        }
 
        /* Ensure that we have a valid GPE number */
 
-       gpe_event_info = acpi_ev_get_gpe_event_info (gpe_device, gpe_number);
+       gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number);
        if (!gpe_event_info) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
@@ -613,16 +562,15 @@ acpi_get_gpe_status (
 
        /* Obtain status on the requested GPE number */
 
-       status = acpi_hw_get_gpe_status (gpe_event_info, event_status);
+       status = acpi_hw_get_gpe_status(gpe_event_info, event_status);
 
-unlock_and_exit:
+      unlock_and_exit:
        if (flags & ACPI_NOT_ISR) {
-               (void) acpi_ut_release_mutex (ACPI_MTX_EVENTS);
+               (void)acpi_ut_release_mutex(ACPI_MTX_EVENTS);
        }
-       return_ACPI_STATUS (status);
+       return_ACPI_STATUS(status);
 }
-#endif  /*  ACPI_FUTURE_USAGE  */
-
+#endif                         /*  ACPI_FUTURE_USAGE  */
 
 /*******************************************************************************
  *
@@ -631,7 +579,7 @@ unlock_and_exit:
  * PARAMETERS:  gpe_device          - Handle to the parent GPE Block Device
  *              gpe_block_address   - Address and space_iD
  *              register_count      - Number of GPE register pairs in the block
- *              interrupt_level     - H/W interrupt for the block
+ *              interrupt_number    - H/W interrupt for the block
  *
  * RETURN:      Status
  *
@@ -640,33 +588,27 @@ unlock_and_exit:
  ******************************************************************************/
 
 acpi_status
-acpi_install_gpe_block (
-       acpi_handle                     gpe_device,
-       struct acpi_generic_address     *gpe_block_address,
-       u32                             register_count,
-       u32                             interrupt_level)
+acpi_install_gpe_block(acpi_handle gpe_device,
+                      struct acpi_generic_address *gpe_block_address,
+                      u32 register_count, u32 interrupt_number)
 {
-       acpi_status                     status;
-       union acpi_operand_object       *obj_desc;
-       struct acpi_namespace_node      *node;
-       struct acpi_gpe_block_info      *gpe_block;
-
+       acpi_status status;
+       union acpi_operand_object *obj_desc;
+       struct acpi_namespace_node *node;
+       struct acpi_gpe_block_info *gpe_block;
 
-       ACPI_FUNCTION_TRACE ("acpi_install_gpe_block");
+       ACPI_FUNCTION_TRACE("acpi_install_gpe_block");
 
-
-       if ((!gpe_device)      ||
-               (!gpe_block_address) ||
-               (!register_count)) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+       if ((!gpe_device) || (!gpe_block_address) || (!register_count)) {
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
-       node = acpi_ns_map_handle_to_node (gpe_device);
+       node = acpi_ns_map_handle_to_node(gpe_device);
        if (!node) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
@@ -676,31 +618,40 @@ acpi_install_gpe_block (
         * For user-installed GPE Block Devices, the gpe_block_base_number
         * is always zero
         */
-       status = acpi_ev_create_gpe_block (node, gpe_block_address, register_count,
-                         0, interrupt_level, &gpe_block);
-       if (ACPI_FAILURE (status)) {
+       status =
+           acpi_ev_create_gpe_block(node, gpe_block_address, register_count, 0,
+                                    interrupt_number, &gpe_block);
+       if (ACPI_FAILURE(status)) {
+               goto unlock_and_exit;
+       }
+
+       /* Run the _PRW methods and enable the GPEs */
+
+       status = acpi_ev_initialize_gpe_block(node, gpe_block);
+       if (ACPI_FAILURE(status)) {
                goto unlock_and_exit;
        }
 
        /* Get the device_object attached to the node */
 
-       obj_desc = acpi_ns_get_attached_object (node);
+       obj_desc = acpi_ns_get_attached_object(node);
        if (!obj_desc) {
                /* No object, create a new one */
 
-               obj_desc = acpi_ut_create_internal_object (ACPI_TYPE_DEVICE);
+               obj_desc = acpi_ut_create_internal_object(ACPI_TYPE_DEVICE);
                if (!obj_desc) {
                        status = AE_NO_MEMORY;
                        goto unlock_and_exit;
                }
 
-               status = acpi_ns_attach_object (node, obj_desc, ACPI_TYPE_DEVICE);
+               status =
+                   acpi_ns_attach_object(node, obj_desc, ACPI_TYPE_DEVICE);
 
                /* Remove local reference to the object */
 
-               acpi_ut_remove_reference (obj_desc);
+               acpi_ut_remove_reference(obj_desc);
 
-               if (ACPI_FAILURE (status)) {
+               if (ACPI_FAILURE(status)) {
                        goto unlock_and_exit;
                }
        }
@@ -709,13 +660,12 @@ acpi_install_gpe_block (
 
        obj_desc->device.gpe_block = gpe_block;
 
-
-unlock_and_exit:
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
-       return_ACPI_STATUS (status);
+      unlock_and_exit:
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+       return_ACPI_STATUS(status);
 }
-EXPORT_SYMBOL(acpi_install_gpe_block);
 
+EXPORT_SYMBOL(acpi_install_gpe_block);
 
 /*******************************************************************************
  *
@@ -729,28 +679,24 @@ EXPORT_SYMBOL(acpi_install_gpe_block);
  *
  ******************************************************************************/
 
-acpi_status
-acpi_remove_gpe_block (
-       acpi_handle                     gpe_device)
+acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
 {
-       union acpi_operand_object       *obj_desc;
-       acpi_status                     status;
-       struct acpi_namespace_node      *node;
-
-
-       ACPI_FUNCTION_TRACE ("acpi_remove_gpe_block");
+       union acpi_operand_object *obj_desc;
+       acpi_status status;
+       struct acpi_namespace_node *node;
 
+       ACPI_FUNCTION_TRACE("acpi_remove_gpe_block");
 
        if (!gpe_device) {
-               return_ACPI_STATUS (AE_BAD_PARAMETER);
+               return_ACPI_STATUS(AE_BAD_PARAMETER);
        }
 
-       status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
-       if (ACPI_FAILURE (status)) {
+       status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);
+       if (ACPI_FAILURE(status)) {
                return (status);
        }
 
-       node = acpi_ns_map_handle_to_node (gpe_device);
+       node = acpi_ns_map_handle_to_node(gpe_device);
        if (!node) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
@@ -758,21 +704,21 @@ acpi_remove_gpe_block (
 
        /* Get the device_object attached to the node */
 
-       obj_desc = acpi_ns_get_attached_object (node);
-       if (!obj_desc ||
-               !obj_desc->device.gpe_block) {
-               return_ACPI_STATUS (AE_NULL_OBJECT);
+       obj_desc = acpi_ns_get_attached_object(node);
+       if (!obj_desc || !obj_desc->device.gpe_block) {
+               return_ACPI_STATUS(AE_NULL_OBJECT);
        }
 
        /* Delete the GPE block (but not the device_object) */
 
-       status = acpi_ev_delete_gpe_block (obj_desc->device.gpe_block);
-       if (ACPI_SUCCESS (status)) {
+       status = acpi_ev_delete_gpe_block(obj_desc->device.gpe_block);
+       if (ACPI_SUCCESS(status)) {
                obj_desc->device.gpe_block = NULL;
        }
 
-unlock_and_exit:
-       (void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
-       return_ACPI_STATUS (status);
+      unlock_and_exit:
+       (void)acpi_ut_release_mutex(ACPI_MTX_NAMESPACE);
+       return_ACPI_STATUS(status);
 }
+
 EXPORT_SYMBOL(acpi_remove_gpe_block);