linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/acpi/events/evxfregn.c b/drivers/acpi/events/evxfregn.c
index 83b12a9..abf5cac 100644 (file)
--- a/drivers/acpi/events/evxfregn.c
+++ b/drivers/acpi/events/evxfregn.c
@@ -42,6 +42,8 @@
  * POSSIBILITY OF SUCH DAMAGES.
  */
 
+#include <linux/module.h>
+
 #include <acpi/acpi.h>
 #include <acpi/acnamesp.h>
 #include <acpi/acevents.h>
@@ -73,7 +75,7 @@ acpi_install_address_space_handler(acpi_handle device,
        struct acpi_namespace_node *node;
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE(acpi_install_address_space_handler);
+       ACPI_FUNCTION_TRACE("acpi_install_address_space_handler");
 
        /* Parameter validation */
 
@@ -112,7 +114,7 @@ acpi_install_address_space_handler(acpi_handle device,
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_install_address_space_handler)
+EXPORT_SYMBOL(acpi_install_address_space_handler);
 
 /*******************************************************************************
  *
@@ -127,6 +129,7 @@ ACPI_EXPORT_SYMBOL(acpi_install_address_space_handler)
  * DESCRIPTION: Remove a previously installed handler.
  *
  ******************************************************************************/
+
 acpi_status
 acpi_remove_address_space_handler(acpi_handle device,
                                  acpi_adr_space_type space_id,
@@ -139,7 +142,7 @@ acpi_remove_address_space_handler(acpi_handle device,
        struct acpi_namespace_node *node;
        acpi_status status;
 
-       ACPI_FUNCTION_TRACE(acpi_remove_address_space_handler);
+       ACPI_FUNCTION_TRACE("acpi_remove_address_space_handler");
 
        /* Parameter validation */
 
@@ -155,11 +158,7 @@ acpi_remove_address_space_handler(acpi_handle device,
        /* Convert and validate the device handle */
 
        node = acpi_ns_map_handle_to_node(device);
-       if (!node ||
-           ((node->type != ACPI_TYPE_DEVICE) &&
-            (node->type != ACPI_TYPE_PROCESSOR) &&
-            (node->type != ACPI_TYPE_THERMAL) &&
-            (node != acpi_gbl_root_node))) {
+       if (!node) {
                status = AE_BAD_PARAMETER;
                goto unlock_and_exit;
        }
@@ -177,18 +176,9 @@ acpi_remove_address_space_handler(acpi_handle device,
        handler_obj = obj_desc->device.handler;
        last_obj_ptr = &obj_desc->device.handler;
        while (handler_obj) {
-
                /* We have a handler, see if user requested this one */
 
                if (handler_obj->address_space.space_id == space_id) {
-
-                       /* Handler must be the same as the installed handler */
-
-                       if (handler_obj->address_space.handler != handler) {
-                               status = AE_BAD_PARAMETER;
-                               goto unlock_and_exit;
-                       }
-
                        /* Matched space_id, first dereference this in the Regions */
 
                        ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
@@ -239,7 +229,7 @@ acpi_remove_address_space_handler(acpi_handle device,
        /* The handler does not exist */
 
        ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,
-                         "Unable to remove address handler %p for %s(%X), DevNode %p, obj %p\n",
+                         "Unable to remove address handler %p for %s(%X), dev_node %p, obj %p\n",
                          handler, acpi_ut_get_region_name(space_id), space_id,
                          node, obj_desc));
 
@@ -250,4 +240,4 @@ acpi_remove_address_space_handler(acpi_handle device,
        return_ACPI_STATUS(status);
 }
 
-ACPI_EXPORT_SYMBOL(acpi_remove_address_space_handler)
+EXPORT_SYMBOL(acpi_remove_address_space_handler);