1 files changed, 1 insertions, 14 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1feedcea2d40..d6bf0578737b 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -891,6 +891,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);
@@ -928,19 +929,6 @@ ec_parse_io_ports(struct acpi_resource *resource, void *context)
         return AE_OK;
 }
 
-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))
@@ -1061,7 +1049,6 @@ static struct acpi_driver acpi_ec_driver = {
         .ops = {
                 .add = acpi_ec_add,
                 .remove = acpi_ec_remove,
-                .stop = acpi_ec_stop,
                 .suspend = acpi_ec_suspend,
                 .resume = acpi_ec_resume,
                 },