summaryrefslogtreecommitdiff
path: root/drivers/platform/x86
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r--drivers/platform/x86/intel-hid.c6
-rw-r--r--drivers/platform/x86/intel-vbtn.c6
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index 18ac237114ff..ef6d4bd77b1a 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -257,7 +257,6 @@ static int intel_hid_pm_prepare(struct device *device)
struct intel_hid_priv *priv = dev_get_drvdata(device);
priv->wakeup_mode = true;
- acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
}
return 0;
}
@@ -266,10 +265,7 @@ static void intel_hid_pm_complete(struct device *device)
{
struct intel_hid_priv *priv = dev_get_drvdata(device);
- if (priv->wakeup_mode) {
- acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
- priv->wakeup_mode = false;
- }
+ priv->wakeup_mode = false;
}
static int intel_hid_pl_suspend_handler(struct device *device)
diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c
index b28e5519337e..b74932307d69 100644
--- a/drivers/platform/x86/intel-vbtn.c
+++ b/drivers/platform/x86/intel-vbtn.c
@@ -205,7 +205,6 @@ static int intel_vbtn_pm_prepare(struct device *dev)
struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
priv->wakeup_mode = true;
- acpi_ec_set_gpe_wake_mask(ACPI_GPE_ENABLE);
}
return 0;
}
@@ -214,10 +213,7 @@ static void intel_vbtn_pm_complete(struct device *dev)
{
struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
- if (priv->wakeup_mode) {
- acpi_ec_set_gpe_wake_mask(ACPI_GPE_DISABLE);
- priv->wakeup_mode = false;
- }
+ priv->wakeup_mode = false;
}
static int intel_vbtn_pm_resume(struct device *dev)