1 files changed, 8 insertions, 46 deletions

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index adddb2e3466d..e2b8cccd23ab 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1541,49 +1541,6 @@ static int acpi_ec_setup(struct acpi_ec *ec, bool handle_events)
         return ret;
 }
 
-static int acpi_config_boot_ec(struct acpi_ec *ec, acpi_handle handle,
-                               bool handle_events, bool is_ecdt)
-{
-        int ret;
-
-        /*
-         * Changing the ACPI handle results in a re-configuration of the
-         * boot EC. And if it happens after the namespace initialization,
-         * it causes _REG evaluations.
-         */
-        if (boot_ec && boot_ec->handle != handle)
-                ec_remove_handlers(boot_ec);
-
-        /* Unset old boot EC */
-        if (boot_ec != ec)
-                acpi_ec_free(boot_ec);
-
-        /*
-         * ECDT device creation is split into acpi_ec_ecdt_probe() and
-         * acpi_ec_ecdt_start(). This function takes care of completing the
-         * ECDT parsing logic as the handle update should be performed
-         * between the installation/uninstallation of the handlers.
-         */
-        if (ec->handle != handle)
-                ec->handle = handle;
-
-        ret = acpi_ec_setup(ec, handle_events);
-        if (ret)
-                return ret;
-
-        /* Set new boot EC */
-        if (!boot_ec) {
-                boot_ec = ec;
-                boot_ec_is_ecdt = is_ecdt;
-        }
-
-        acpi_handle_info(boot_ec->handle,
-                         "Used as boot %s EC to handle transactions%s\n",
-                         is_ecdt ? "ECDT" : "DSDT",
-                         handle_events ? " and events" : "");
-        return ret;
-}
-
 static bool acpi_ec_ecdt_get_handle(acpi_handle *phandle)
 {
         struct acpi_table_ecdt *ecdt_ptr;
@@ -1651,12 +1608,17 @@ static int acpi_ec_add(struct acpi_device *device)
                         acpi_ec_free(ec);
                         ec = boot_ec;
                 }
-                ret = acpi_config_boot_ec(ec, ec->handle, true, is_ecdt);
-        } else
-                ret = acpi_ec_setup(ec, true);
+        }
+
+        ret = acpi_ec_setup(ec, true);
         if (ret)
                 goto err_query;
 
+        if (ec == boot_ec)
+                acpi_handle_info(boot_ec->handle,
+                                 "Boot %s EC used to handle transactions and events\n",
+                                 is_ecdt ? "ECDT" : "DSDT");
+
         device->driver_data = ec;
 
         ret = !!request_region(ec->data_addr, 1, "EC data");