ACPI: EC: Drop the EC_FLAGS_IGNORE_DSDT_GPE quirk

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

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index f6a0228..488c9ec 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -180,7 +180,6 @@ static struct workqueue_struct *ec_wq;
 static struct workqueue_struct *ec_query_wq;
 
 static int EC_FLAGS_CORRECT_ECDT; /* Needs ECDT port address correction */
-static int EC_FLAGS_IGNORE_DSDT_GPE; /* Needs ECDT GPE as correction setting */
 static int EC_FLAGS_TRUST_DSDT_GPE; /* Needs DSDT GPE as correction setting */
 static int EC_FLAGS_CLEAR_ON_RESUME; /* Needs acpi_ec_clear() on boot/resume */
 
@@ -1407,24 +1406,16 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
        if (ec->data_addr == 0 || ec->command_addr == 0)
                return AE_OK;
 
-       if (boot_ec && boot_ec_is_ecdt && EC_FLAGS_IGNORE_DSDT_GPE) {
-               /*
-                * Always inherit the GPE number setting from the ECDT
-                * EC.
-                */
-               ec->gpe = boot_ec->gpe;
-       } else {
-               /* Get GPE bit assignment (EC events). */
-               /* TODO: Add support for _GPE returning a package */
-               status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp);
-               if (ACPI_SUCCESS(status))
-                       ec->gpe = tmp;
+       /* Get GPE bit assignment (EC events). */
+       /* TODO: Add support for _GPE returning a package */
+       status = acpi_evaluate_integer(handle, "_GPE", NULL, &tmp);
+       if (ACPI_SUCCESS(status))
+               ec->gpe = tmp;
+       /*
+        * Errors are non-fatal, allowing for ACPI Reduced Hardware
+        * platforms which use GpioInt instead of GPE.
+        */
 
-               /*
-                * Errors are non-fatal, allowing for ACPI Reduced Hardware
-                * platforms which use GpioInt instead of GPE.
-                */
-       }
        /* Use the global lock for all EC transactions? */
        tmp = 0;
        acpi_evaluate_integer(handle, "_GLK", NULL, &tmp);
@@ -1862,60 +1853,12 @@ static int ec_honor_dsdt_gpe(const struct dmi_system_id *id)
        return 0;
 }
 
-/*
- * Some DSDTs contain wrong GPE setting.
- * Asus FX502VD/VE, GL702VMK, X550VXK, X580VD
- * https://bugzilla.kernel.org/show_bug.cgi?id=195651
- */
-static int ec_honor_ecdt_gpe(const struct dmi_system_id *id)
-{
-       pr_debug("Detected system needing ignore DSDT GPE setting.\n");
-       EC_FLAGS_IGNORE_DSDT_GPE = 1;
-       return 0;
-}
-
 static const struct dmi_system_id ec_dmi_table[] __initconst = {
        {
        ec_correct_ecdt, "MSI MS-171F", {
        DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star"),
        DMI_MATCH(DMI_PRODUCT_NAME, "MS-171F"),}, NULL},
        {
-       ec_honor_ecdt_gpe, "ASUS FX502VD", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "FX502VD"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUS FX502VE", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "FX502VE"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUS GL702VMK", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "GL702VMK"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X505BA", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "X505BA"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X505BP", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "X505BP"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X542BA", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "X542BA"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUSTeK COMPUTER INC. X542BP", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "X542BP"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUS X550VXK", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "X550VXK"),}, NULL},
-       {
-       ec_honor_ecdt_gpe, "ASUS X580VD", {
-       DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-       DMI_MATCH(DMI_PRODUCT_NAME, "X580VD"),}, NULL},
-       {
        /* https://bugzilla.kernel.org/show_bug.cgi?id=209989 */
        ec_honor_dsdt_gpe, "HP Pavilion Gaming Laptop 15-cx0xxx", {
        DMI_MATCH(DMI_SYS_VENDOR, "HP"),