linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / acpi / events / evxfevnt.c

diff --git a/drivers/acpi/events/evxfevnt.c b/drivers/acpi/events/evxfevnt.c
index 7ebc2ef..ec9ce84 100644 (file)
--- a/drivers/acpi/events/evxfevnt.c
+++ b/drivers/acpi/events/evxfevnt.c
@@ -41,6 +41,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#include <linux/module.h>
+
 #include <acpi/acpi.h>
 #include <acpi/acevents.h>
 #include <acpi/acnamesp.h>
@@ -63,7 +65,7 @@ acpi_status acpi_enable(void)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE(acpi_enable);
+       ACPI_FUNCTION_TRACE("acpi_enable");
 
        /* Make sure we have the FADT */
 
@@ -92,8 +94,6 @@ acpi_status acpi_enable(void)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_enable)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_disable
@@ -105,11 +105,12 @@ ACPI_EXPORT_SYMBOL(acpi_enable)
  * DESCRIPTION: Transfers the system into LEGACY (non-ACPI) mode.
  *
  ******************************************************************************/
+
 acpi_status acpi_disable(void)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE(acpi_disable);
+       ACPI_FUNCTION_TRACE("acpi_disable");
 
        if (!acpi_gbl_FADT) {
                ACPI_WARNING((AE_INFO, "No FADT information present!"));
@@ -136,8 +137,6 @@ acpi_status acpi_disable(void)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_disable)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enable_event
@@ -150,12 +149,13 @@ ACPI_EXPORT_SYMBOL(acpi_disable)
  * DESCRIPTION: Enable an ACPI event (fixed)
  *
  ******************************************************************************/
+
 acpi_status acpi_enable_event(u32 event, u32 flags)
 {
        acpi_status status = AE_OK;
        u32 value;
 
-       ACPI_FUNCTION_TRACE(acpi_enable_event);
+       ACPI_FUNCTION_TRACE("acpi_enable_event");
 
        /* Decode the Fixed Event */
 
@@ -193,7 +193,7 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_enable_event)
+EXPORT_SYMBOL(acpi_enable_event);
 
 /*******************************************************************************
  *
@@ -208,12 +208,13 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event)
  * 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 status = AE_OK;
        struct acpi_gpe_event_info *gpe_event_info;
 
-       ACPI_FUNCTION_TRACE(acpi_set_gpe_type);
+       ACPI_FUNCTION_TRACE("acpi_set_gpe_type");
 
        /* Ensure that we have a valid GPE number */
 
@@ -235,7 +236,7 @@ acpi_status acpi_set_gpe_type(acpi_handle gpe_device, u32 gpe_number, u8 type)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
+EXPORT_SYMBOL(acpi_set_gpe_type);
 
 /*******************************************************************************
  *
@@ -251,12 +252,13 @@ ACPI_EXPORT_SYMBOL(acpi_set_gpe_type)
  * DESCRIPTION: Enable an ACPI event (general purpose)
  *
  ******************************************************************************/
+
 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_FUNCTION_TRACE("acpi_enable_gpe");
 
        /* Use semaphore lock if not executing at interrupt level */
 
@@ -286,7 +288,7 @@ acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
+EXPORT_SYMBOL(acpi_enable_gpe);
 
 /*******************************************************************************
  *
@@ -302,12 +304,13 @@ ACPI_EXPORT_SYMBOL(acpi_enable_gpe)
  * DESCRIPTION: Disable an ACPI event (general purpose)
  *
  ******************************************************************************/
+
 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_FUNCTION_TRACE("acpi_disable_gpe");
 
        /* Use semaphore lock if not executing at interrupt level */
 
@@ -335,8 +338,6 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_disable_event
@@ -349,12 +350,13 @@ ACPI_EXPORT_SYMBOL(acpi_disable_gpe)
  * DESCRIPTION: Disable an ACPI event (fixed)
  *
  ******************************************************************************/
+
 acpi_status acpi_disable_event(u32 event, u32 flags)
 {
        acpi_status status = AE_OK;
        u32 value;
 
-       ACPI_FUNCTION_TRACE(acpi_disable_event);
+       ACPI_FUNCTION_TRACE("acpi_disable_event");
 
        /* Decode the Fixed Event */
 
@@ -390,7 +392,7 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_disable_event)
+EXPORT_SYMBOL(acpi_disable_event);
 
 /*******************************************************************************
  *
@@ -403,11 +405,12 @@ ACPI_EXPORT_SYMBOL(acpi_disable_event)
  * DESCRIPTION: Clear an ACPI event (fixed)
  *
  ******************************************************************************/
+
 acpi_status acpi_clear_event(u32 event)
 {
        acpi_status status = AE_OK;
 
-       ACPI_FUNCTION_TRACE(acpi_clear_event);
+       ACPI_FUNCTION_TRACE("acpi_clear_event");
 
        /* Decode the Fixed Event */
 
@@ -426,7 +429,7 @@ acpi_status acpi_clear_event(u32 event)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_clear_event)
+EXPORT_SYMBOL(acpi_clear_event);
 
 /*******************************************************************************
  *
@@ -441,12 +444,13 @@ ACPI_EXPORT_SYMBOL(acpi_clear_event)
  * DESCRIPTION: Clear an ACPI event (general purpose)
  *
  ******************************************************************************/
+
 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_FUNCTION_TRACE("acpi_clear_gpe");
 
        /* Use semaphore lock if not executing at interrupt level */
 
@@ -474,8 +478,6 @@ acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number, u32 flags)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
-
 #ifdef ACPI_FUTURE_USAGE
 /*******************************************************************************
  *
@@ -490,11 +492,12 @@ ACPI_EXPORT_SYMBOL(acpi_clear_gpe)
  * DESCRIPTION: Obtains and returns the current status of the event
  *
  ******************************************************************************/
+
 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_FUNCTION_TRACE("acpi_get_event_status");
 
        if (!event_status) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -515,8 +518,6 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_get_event_status)
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_get_gpe_status
@@ -532,6 +533,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_event_status)
  * DESCRIPTION: Get status of an event (general purpose)
  *
  ******************************************************************************/
+
 acpi_status
 acpi_get_gpe_status(acpi_handle gpe_device,
                    u32 gpe_number, u32 flags, acpi_event_status * event_status)
@@ -539,7 +541,7 @@ acpi_get_gpe_status(acpi_handle gpe_device,
        acpi_status status = AE_OK;
        struct acpi_gpe_event_info *gpe_event_info;
 
-       ACPI_FUNCTION_TRACE(acpi_get_gpe_status);
+       ACPI_FUNCTION_TRACE("acpi_get_gpe_status");
 
        /* Use semaphore lock if not executing at interrupt level */
 
@@ -568,8 +570,6 @@ acpi_get_gpe_status(acpi_handle gpe_device,
        }
        return_ACPI_STATUS(status);
 }
-
-ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
 #endif                         /*  ACPI_FUTURE_USAGE  */
 
 /*******************************************************************************
@@ -586,6 +586,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_gpe_status)
  * DESCRIPTION: Create and Install a block of GPE registers
  *
  ******************************************************************************/
+
 acpi_status
 acpi_install_gpe_block(acpi_handle gpe_device,
                       struct acpi_generic_address *gpe_block_address,
@@ -596,7 +597,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
        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);
@@ -635,7 +636,6 @@ acpi_install_gpe_block(acpi_handle gpe_device,
 
        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);
@@ -665,7 +665,7 @@ acpi_install_gpe_block(acpi_handle gpe_device,
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)
+EXPORT_SYMBOL(acpi_install_gpe_block);
 
 /*******************************************************************************
  *
@@ -678,13 +678,14 @@ ACPI_EXPORT_SYMBOL(acpi_install_gpe_block)
  * DESCRIPTION: Remove a previously installed block of GPE registers
  *
  ******************************************************************************/
+
 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);
+       ACPI_FUNCTION_TRACE("acpi_remove_gpe_block");
 
        if (!gpe_device) {
                return_ACPI_STATUS(AE_BAD_PARAMETER);
@@ -720,4 +721,4 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_remove_gpe_block)
+EXPORT_SYMBOL(acpi_remove_gpe_block);