Merge branch 'bjorn-start-stop-2.6.32' into release

1 files changed, 44 insertions, 74 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 5180f0f1dd02..f28619d658f7 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -787,6 +787,42 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
         return AE_CTRL_TERMINATE;
 }
 
+static int ec_install_handlers(struct acpi_ec *ec)
+{
+        acpi_status status;
+        if (test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
+                return 0;
+        status = acpi_install_gpe_handler(NULL, ec->gpe,
+                                  ACPI_GPE_EDGE_TRIGGERED,
+                                  &acpi_ec_gpe_handler, ec);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+        acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
+        acpi_enable_gpe(NULL, ec->gpe);
+        status = acpi_install_address_space_handler(ec->handle,
+                                                    ACPI_ADR_SPACE_EC,
+                                                    &acpi_ec_space_handler,
+                                                    NULL, ec);
+        if (ACPI_FAILURE(status)) {
+                if (status == AE_NOT_FOUND) {
+                        /*
+                         * Maybe OS fails in evaluating the _REG object.
+                         * The AE_NOT_FOUND error will be ignored and OS
+                         * continue to initialize EC.
+                         */
+                        printk(KERN_ERR "Fail in evaluating the _REG object"
+                                " of EC device. Broken bios is suspected.\n");
+                } else {
+                        acpi_remove_gpe_handler(NULL, ec->gpe,
+                                &acpi_ec_gpe_handler);
+                        return -ENODEV;
+                }
+        }
+
+        set_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
+        return 0;
+}
+
 static void ec_remove_handlers(struct acpi_ec *ec)
 {
         if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle,
@@ -801,9 +837,8 @@ static void ec_remove_handlers(struct acpi_ec *ec)
 static int acpi_ec_add(struct acpi_device *device)
 {
         struct acpi_ec *ec = NULL;
+        int ret;
 
-        if (!device)
-                return -EINVAL;
         strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
         strcpy(acpi_device_class(device), ACPI_EC_CLASS);
 
@@ -838,7 +873,12 @@ static int acpi_ec_add(struct acpi_device *device)
                           ec->gpe, ec->command_addr, ec->data_addr);
         pr_info(PREFIX "driver started in %s mode\n",
                 (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll");
-        return 0;
+
+        ret = ec_install_handlers(ec);
+
+        /* EC is fully operational, allow queries */
+        clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
+        return ret;
 }
 
 static int acpi_ec_remove(struct acpi_device *device, int type)
@@ -850,6 +890,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
                 return -EINVAL;
 
         ec = acpi_driver_data(device);
+        ec_remove_handlers(ec);
         mutex_lock(&ec->lock);
         list_for_each_entry_safe(handler, tmp, &ec->list, node) {
                 list_del(&handler->node);
@@ -887,75 +928,6 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
         return AE_OK;
 }
 
-static int ec_install_handlers(struct acpi_ec *ec)
-{
-        acpi_status status;
-        if (test_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags))
-                return 0;
-        status = acpi_install_gpe_handler(NULL, ec->gpe,
-                                  ACPI_GPE_EDGE_TRIGGERED,
-                                  &acpi_ec_gpe_handler, ec);
-        if (ACPI_FAILURE(status))
-                return -ENODEV;
-        acpi_set_gpe_type(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME);
-        acpi_enable_gpe(NULL, ec->gpe);
-        status = acpi_install_address_space_handler(ec->handle,
-                                                    ACPI_ADR_SPACE_EC,
-                                                    &acpi_ec_space_handler,
-                                                    NULL, ec);
-        if (ACPI_FAILURE(status)) {
-                if (status == AE_NOT_FOUND) {
-                        /*
-                         * Maybe OS fails in evaluating the _REG object.
-                         * The AE_NOT_FOUND error will be ignored and OS
-                         * continue to initialize EC.
-                         */
-                        printk(KERN_ERR "Fail in evaluating the _REG object"
-                                " of EC device. Broken bios is suspected.\n");
-                } else {
-                        acpi_remove_gpe_handler(NULL, ec->gpe,
-                                &acpi_ec_gpe_handler);
-                        return -ENODEV;
-                }
-        }
-
-        set_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
-        return 0;
-}
-
-static int acpi_ec_start(struct acpi_device *device)
-{
-        struct acpi_ec *ec;
-        int ret = 0;
-
-        if (!device)
-                return -EINVAL;
-
-        ec = acpi_driver_data(device);
-
-        if (!ec)
-                return -EINVAL;
-
-        ret = ec_install_handlers(ec);
-
-        /* EC is fully operational, allow queries */
-        clear_bit(EC_FLAGS_QUERY_PENDING, &ec->flags);
-        return ret;
-}
-
-static int acpi_ec_stop(struct acpi_device *device, int type)
-{
-        struct acpi_ec *ec;
-        if (!device)
-                return -EINVAL;
-        ec = acpi_driver_data(device);
-        if (!ec)
-                return -EINVAL;
-        ec_remove_handlers(ec);
-
-        return 0;
-}
-
 int __init acpi_boot_ec_enable(void)
 {
         if (!boot_ec || test_bit(EC_FLAGS_HANDLERS_INSTALLED, &boot_ec->flags))
@@ -1076,8 +1048,6 @@ static struct acpi_driver acpi_ec_driver = {
         .ops = {
                 .add = acpi_ec_add,
                 .remove = acpi_ec_remove,
-                .start = acpi_ec_start,
-                .stop = acpi_ec_stop,
                 .suspend = acpi_ec_suspend,
                 .resume = acpi_ec_resume,
                 },