patch-2.4.10 linux/drivers/acpi/events/evsci.c
Next file: linux/drivers/acpi/events/evxface.c
Previous file: linux/drivers/acpi/events/evrgnini.c
Back to the patch index
Back to the overall index
- Lines: 126
- Date:
Sun Sep 23 09:42:32 2001
- Orig file:
v2.4.9/linux/drivers/acpi/events/evsci.c
- Orig date:
Tue Jul 3 17:08:19 2001
diff -u --recursive --new-file v2.4.9/linux/drivers/acpi/events/evsci.c linux/drivers/acpi/events/evsci.c
@@ -2,7 +2,7 @@
*
* Module Name: evsci - System Control Interrupt configuration and
* legacy to ACPI mode state transition functions
- * $Revision: 72 $
+ * $Revision: 74 $
*
******************************************************************************/
@@ -64,6 +64,9 @@
u32 interrupt_handled = INTERRUPT_NOT_HANDLED;
+ FUNCTION_TRACE("Ev_sci_handler");
+
+
/*
* Make sure that ACPI is enabled by checking SCI_EN. Note that we are
* required to treat the SCI interrupt as sharable, level, active low.
@@ -71,7 +74,7 @@
if (!acpi_hw_register_bit_access (ACPI_READ, ACPI_MTX_DO_NOT_LOCK, SCI_EN)) {
/* ACPI is not enabled; this interrupt cannot be for us */
- return (INTERRUPT_NOT_HANDLED);
+ return_VALUE (INTERRUPT_NOT_HANDLED);
}
/*
@@ -88,7 +91,7 @@
*/
interrupt_handled |= acpi_ev_gpe_detect ();
- return (interrupt_handled);
+ return_VALUE (interrupt_handled);
}
@@ -107,14 +110,15 @@
u32
acpi_ev_install_sci_handler (void)
{
- u32 except = AE_OK;
+ u32 status = AE_OK;
+
+ FUNCTION_TRACE ("Ev_install_sci_handler");
- except = acpi_os_install_interrupt_handler ((u32) acpi_gbl_FADT->sci_int,
- acpi_ev_sci_handler,
- NULL);
- return (except);
+ status = acpi_os_install_interrupt_handler ((u32) acpi_gbl_FADT->sci_int,
+ acpi_ev_sci_handler, NULL);
+ return_ACPI_STATUS (status);
}
@@ -133,9 +137,12 @@
*
******************************************************************************/
-ACPI_STATUS
+acpi_status
acpi_ev_remove_sci_handler (void)
{
+ FUNCTION_TRACE ("Ev_remove_sci_handler");
+
+
#if 0
/* TBD:[Investigate] Figure this out!! Disable all events first ??? */
@@ -166,7 +173,7 @@
acpi_os_remove_interrupt_handler ((u32) acpi_gbl_FADT->sci_int,
acpi_ev_sci_handler);
- return (AE_OK);
+ return_ACPI_STATUS (AE_OK);
}
@@ -188,6 +195,9 @@
u32 index;
+ FUNCTION_TRACE ("Ev_restore_acpi_state");
+
+
/* Restore the state of the chipset enable bits. */
if (acpi_gbl_restore_acpi_chipset == TRUE) {
@@ -232,7 +242,7 @@
}
}
- return;
+ return_VOID;
}
@@ -252,20 +262,21 @@
acpi_ev_terminate (void)
{
+ FUNCTION_TRACE ("Ev_terminate");
+
/*
* Free global tables, etc.
*/
-
if (acpi_gbl_gpe_registers) {
- acpi_ut_free (acpi_gbl_gpe_registers);
+ ACPI_MEM_FREE (acpi_gbl_gpe_registers);
}
if (acpi_gbl_gpe_info) {
- acpi_ut_free (acpi_gbl_gpe_info);
+ ACPI_MEM_FREE (acpi_gbl_gpe_info);
}
- return;
+ return_VOID;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)