Merge branch 'acpi-pm' into pm-core

2 files changed, 1 insertions, 31 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index e8ca5e2cf1e5..e6414e9998bb 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -346,9 +346,7 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool one_dev_on,
         list_for_each_entry(pdd, &genpd->dev_list, list_node) {
                 enum pm_qos_flags_status stat;
 
-                stat = dev_pm_qos_flags(pdd->dev,
-                                        PM_QOS_FLAG_NO_POWER_OFF
-                                                | PM_QOS_FLAG_REMOTE_WAKEUP);
+                stat = dev_pm_qos_flags(pdd->dev, PM_QOS_FLAG_NO_POWER_OFF);
                 if (stat > PM_QOS_FLAGS_NONE)
                         return -EBUSY;
 
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
index 156ab57bca77..29bf28fef136 100644
--- a/drivers/base/power/sysfs.c
+++ b/drivers/base/power/sysfs.c
@@ -309,33 +309,6 @@ static ssize_t pm_qos_no_power_off_store(struct device *dev,
 static DEVICE_ATTR(pm_qos_no_power_off, 0644,
                    pm_qos_no_power_off_show, pm_qos_no_power_off_store);
 
-static ssize_t pm_qos_remote_wakeup_show(struct device *dev,
-                                         struct device_attribute *attr,
-                                         char *buf)
-{
-        return sprintf(buf, "%d\n", !!(dev_pm_qos_requested_flags(dev)
-                                        & PM_QOS_FLAG_REMOTE_WAKEUP));
-}
-
-static ssize_t pm_qos_remote_wakeup_store(struct device *dev,
-                                          struct device_attribute *attr,
-                                          const char *buf, size_t n)
-{
-        int ret;
-
-        if (kstrtoint(buf, 0, &ret))
-                return -EINVAL;
-
-        if (ret != 0 && ret != 1)
-                return -EINVAL;
-
-        ret = dev_pm_qos_update_flags(dev, PM_QOS_FLAG_REMOTE_WAKEUP, ret);
-        return ret < 0 ? ret : n;
-}
-
-static DEVICE_ATTR(pm_qos_remote_wakeup, 0644,
-                   pm_qos_remote_wakeup_show, pm_qos_remote_wakeup_store);
-
 #ifdef CONFIG_PM_SLEEP
 static const char _enabled[] = "enabled";
 static const char _disabled[] = "disabled";
@@ -671,7 +644,6 @@ static const struct attribute_group pm_qos_latency_tolerance_attr_group = {
 
 static struct attribute *pm_qos_flags_attrs[] = {
         &dev_attr_pm_qos_no_power_off.attr,
-        &dev_attr_pm_qos_remote_wakeup.attr,
         NULL,
 };
 static const struct attribute_group pm_qos_flags_attr_group = {