Merge branches 'acpi-ec', 'acpi-video', 'acpi-button' and 'acpi-thermal'

[cascardo/linux.git] / drivers / acpi / ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 290d6f5..999a109 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1359,13 +1359,9 @@ static void ec_remove_handlers(struct acpi_ec *ec)
        }
 }
 
-static int acpi_ec_add(struct acpi_device *device)
+static struct acpi_ec *acpi_ec_alloc(void)
 {
-       struct acpi_ec *ec = NULL;
-       int ret;
-
-       strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
-       strcpy(acpi_device_class(device), ACPI_EC_CLASS);
+       struct acpi_ec *ec;
 
        /* Check for boot EC */
        if (boot_ec) {
@@ -1376,9 +1372,21 @@ static int acpi_ec_add(struct acpi_device *device)
                        first_ec = NULL;
        } else {
                ec = make_acpi_ec();
-               if (!ec)
-                       return -ENOMEM;
        }
+       return ec;
+}
+
+static int acpi_ec_add(struct acpi_device *device)
+{
+       struct acpi_ec *ec = NULL;
+       int ret;
+
+       strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);
+       strcpy(acpi_device_class(device), ACPI_EC_CLASS);
+
+       ec = acpi_ec_alloc();
+       if (!ec)
+               return -ENOMEM;
        if (ec_parse_device(device->handle, 0, ec, NULL) !=
                AE_CTRL_TERMINATE) {
                        kfree(ec);
@@ -1465,27 +1473,31 @@ static const struct acpi_device_id ec_device_ids[] = {
 int __init acpi_ec_dsdt_probe(void)
 {
        acpi_status status;
+       struct acpi_ec *ec;
+       int ret;
 
-       if (boot_ec)
-               return 0;
-
+       ec = acpi_ec_alloc();
+       if (!ec)
+               return -ENOMEM;
        /*
         * Finding EC from DSDT if there is no ECDT EC available. When this
         * function is invoked, ACPI tables have been fully loaded, we can
         * walk namespace now.
         */
-       boot_ec = make_acpi_ec();
-       if (!boot_ec)
-               return -ENOMEM;
        status = acpi_get_devices(ec_device_ids[0].id,
-                                 ec_parse_device, boot_ec, NULL);
-       if (ACPI_FAILURE(status) || !boot_ec->handle)
-               return -ENODEV;
-       if (!ec_install_handlers(boot_ec)) {
-               first_ec = boot_ec;
-               return 0;
+                                 ec_parse_device, ec, NULL);
+       if (ACPI_FAILURE(status) || !ec->handle) {
+               ret = -ENODEV;
+               goto error;
        }
-       return -EFAULT;
+       ret = ec_install_handlers(ec);
+
+error:
+       if (ret)
+               kfree(ec);
+       else
+               first_ec = boot_ec = ec;
+       return ret;
 }
 
 #if 0
@@ -1529,6 +1541,11 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
        return 0;
 }
 
+/*
+ * Some ECDTs contain wrong register addresses.
+ * MSI MS-171F
+ * https://bugzilla.kernel.org/show_bug.cgi?id=12461
+ */
 static int ec_correct_ecdt(const struct dmi_system_id *id)
 {
        pr_debug("Detected system needing ECDT address correction.\n");
@@ -1537,16 +1554,6 @@ static int ec_correct_ecdt(const struct dmi_system_id *id)
 }
 
 static struct dmi_system_id ec_dmi_table[] __initdata = {
-       {
-       ec_correct_ecdt, "Asus L4R", {
-       DMI_MATCH(DMI_BIOS_VERSION, "1008.006"),
-       DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),
-       DMI_MATCH(DMI_BOARD_NAME, "L4R") }, NULL},
-       {
-       ec_correct_ecdt, "Asus M6R", {
-       DMI_MATCH(DMI_BIOS_VERSION, "0207"),
-       DMI_MATCH(DMI_PRODUCT_NAME, "M6R"),
-       DMI_MATCH(DMI_BOARD_NAME, "M6R") }, NULL},
        {
        ec_correct_ecdt, "MSI MS-171F", {
        DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star"),
@@ -1559,12 +1566,13 @@ static struct dmi_system_id ec_dmi_table[] __initdata = {
 
 int __init acpi_ec_ecdt_probe(void)
 {
-       int ret = 0;
+       int ret;
        acpi_status status;
        struct acpi_table_ecdt *ecdt_ptr;
+       struct acpi_ec *ec;
 
-       boot_ec = make_acpi_ec();
-       if (!boot_ec)
+       ec = acpi_ec_alloc();
+       if (!ec)
                return -ENOMEM;
        /*
         * Generate a boot ec context
@@ -1588,28 +1596,20 @@ int __init acpi_ec_ecdt_probe(void)
 
        pr_info("EC description table is found, configuring boot EC\n");
        if (EC_FLAGS_CORRECT_ECDT) {
-               /*
-                * Asus L4R, Asus M6R
-                * https://bugzilla.kernel.org/show_bug.cgi?id=9399
-                * MSI MS-171F
-                * https://bugzilla.kernel.org/show_bug.cgi?id=12461
-                */
-               boot_ec->command_addr = ecdt_ptr->data.address;
-               boot_ec->data_addr = ecdt_ptr->control.address;
+               ec->command_addr = ecdt_ptr->data.address;
+               ec->data_addr = ecdt_ptr->control.address;
        } else {
-               boot_ec->command_addr = ecdt_ptr->control.address;
-               boot_ec->data_addr = ecdt_ptr->data.address;
+               ec->command_addr = ecdt_ptr->control.address;
+               ec->data_addr = ecdt_ptr->data.address;
        }
-       boot_ec->gpe = ecdt_ptr->gpe;
-       boot_ec->handle = ACPI_ROOT_OBJECT;
-       ret = ec_install_handlers(boot_ec);
-       if (!ret)
-               first_ec = boot_ec;
+       ec->gpe = ecdt_ptr->gpe;
+       ec->handle = ACPI_ROOT_OBJECT;
+       ret = ec_install_handlers(ec);
 error:
-       if (ret) {
-               kfree(boot_ec);
-               boot_ec = NULL;
-       }
+       if (ret)
+               kfree(ec);
+       else
+               first_ec = boot_ec = ec;
        return ret;
 }