IB/ipath: Use counters in ipath_poll and cleanup interrupts in ipath_close

[linux-2.6-omap-h63xx.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 2300d81bbc4e4aaf9b8fd17050ab0b4df9923d67..3f7935ab0cf53c0d6ca21b89096ba3c727e0e7b6 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -651,6 +651,19 @@ static struct acpi_ec *make_acpi_ec(void)
        return ec;
 }
 
+static acpi_status
+acpi_ec_register_query_methods(acpi_handle handle, u32 level,
+                              void *context, void **return_value)
+{
+       struct acpi_namespace_node *node = handle;
+       struct acpi_ec *ec = context;
+       int value = 0;
+       if (sscanf(node->name.ascii, "_Q%x", &value) == 1) {
+               acpi_ec_add_query_handler(ec, value, handle, NULL, NULL);
+       }
+       return AE_OK;
+}
+
 static acpi_status
 ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
 {
@@ -668,6 +681,10 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
        if (ACPI_FAILURE(status))
                return status;
 
+       /* Find and register all query methods */
+       acpi_walk_namespace(ACPI_TYPE_METHOD, handle, 1,
+                           acpi_ec_register_query_methods, ec, NULL);
+
        /* Use the global lock for all EC transactions? */
        acpi_evaluate_integer(handle, "_GLK", NULL, &ec->global_lock);
 
@@ -679,14 +696,6 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
        return AE_CTRL_TERMINATE;
 }
 
-static void ec_remove_handlers(struct acpi_ec *ec)
-{
-       acpi_remove_address_space_handler(ec->handle,
-                                         ACPI_ADR_SPACE_EC,
-                                         &acpi_ec_space_handler);
-       acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
-}
-
 static int acpi_ec_add(struct acpi_device *device)
 {
        struct acpi_ec *ec = NULL;
@@ -710,13 +719,16 @@ static int acpi_ec_add(struct acpi_device *device)
        /* Check if we found the boot EC */
        if (boot_ec) {
                if (boot_ec->gpe == ec->gpe) {
-                       ec_remove_handlers(boot_ec);
-                       mutex_destroy(&boot_ec->lock);
-                       kfree(boot_ec);
-                       first_ec = boot_ec = NULL;
+                       /* We might have incorrect info for GL at boot time */
+                       mutex_lock(&boot_ec->lock);
+                       boot_ec->global_lock = ec->global_lock;
+                       /* Copy handlers from new ec into boot ec */
+                       list_splice(&ec->list, &boot_ec->list);
+                       mutex_unlock(&boot_ec->lock);
+                       kfree(ec);
+                       ec = boot_ec;
                }
-       }
-       if (!first_ec)
+       } else
                first_ec = ec;
        ec->handle = device->handle;
        acpi_driver_data(device) = ec;
@@ -745,6 +757,9 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
        if (ec == first_ec)
                first_ec = NULL;
 
+       /* Don't touch boot EC */
+       if (boot_ec != ec)
+               kfree(ec);
        return 0;
 }
 
@@ -808,7 +823,9 @@ static int acpi_ec_start(struct acpi_device *device)
        if (!ec)
                return -EINVAL;
 
-       ret = ec_install_handlers(ec);
+       /* Boot EC is already working */
+       if (ec != boot_ec)
+               ret = ec_install_handlers(ec);
 
        /* EC is fully operational, allow queries */
        atomic_set(&ec->query_pending, 0);
@@ -818,6 +835,7 @@ static int acpi_ec_start(struct acpi_device *device)
 
 static int acpi_ec_stop(struct acpi_device *device, int type)
 {
+       acpi_status status;
        struct acpi_ec *ec;
 
        if (!device)
@@ -826,7 +844,21 @@ static int acpi_ec_stop(struct acpi_device *device, int type)
        ec = acpi_driver_data(device);
        if (!ec)
                return -EINVAL;
-       ec_remove_handlers(ec);
+
+       /* Don't touch boot EC */
+       if (ec == boot_ec)
+               return 0;
+
+       status = acpi_remove_address_space_handler(ec->handle,
+                                                  ACPI_ADR_SPACE_EC,
+                                                  &acpi_ec_space_handler);
+       if (ACPI_FAILURE(status))
+               return -ENODEV;
+
+       status = acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
+       if (ACPI_FAILURE(status))
+               return -ENODEV;
+
        return 0;
 }
 
@@ -854,7 +886,8 @@ int __init acpi_ec_ecdt_probe(void)
                printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
                status = acpi_get_devices(ec_device_ids[0].id, ec_parse_device,
                                                boot_ec, NULL);
-               if (ACPI_FAILURE(status))
+               /* Check that acpi_get_devices actually find something */
+               if (ACPI_FAILURE(status) || !boot_ec->handle)
                        goto error;
        }