diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2014-12-05 23:02:56 +0100 |
|---|---|---|
| committer | Amit Kucheria <amit.kucheria@verdurent.com> | 2014-12-12 00:51:51 +0530 |
| commit | d18c828b1cd414fddaa9d28c070326e08d23943e (patch) | |
| tree | 5f8d4faf7d5054611e60b51f5c3e119749fff60a | |
| parent | 381875e82fe391e94d8097ef44308052f23fcfb4 (diff) | |
HACK: drop the dark resume code that got introduce in one of the mali patches
| -rw-r--r-- | drivers/base/power/sysfs.c | 51 |
1 files changed, 1 insertions, 50 deletions
diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c index 78b229b5871c..a2dc78032f02 100644 --- a/drivers/base/power/sysfs.c +++ b/drivers/base/power/sysfs.c @@ -529,53 +529,6 @@ static DEVICE_ATTR(wakeup_prevent_sleep_time_ms, 0444, wakeup_prevent_sleep_time_show, NULL); #endif /* CONFIG_PM_AUTOSLEEP */ -static ssize_t dark_resume_active_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - return dev->power.use_dark_resume ? sprintf(buf, "%s\n", enabled) : - sprintf(buf, "%s\n", disabled); -} - -static ssize_t dark_resume_active_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t n) -{ - if (sysfs_streq(enabled, buf)) - dev->power.use_dark_resume = true; - else if (sysfs_streq(disabled, buf)) - dev->power.use_dark_resume = false; - else - return -EINVAL; - return n; -} - -static DEVICE_ATTR(dark_resume_active, 0644, - dark_resume_active_show, dark_resume_active_store); - -static ssize_t dark_resume_source_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - return dev->power.dpd && dev->power.dpd->is_source ? - sprintf(buf, "%s\n", enabled) : - sprintf(buf, "%s\n", disabled); -} - -static ssize_t dark_resume_source_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t n) -{ - if (sysfs_streq(enabled, buf) && dev->power.dpd) - dpm_set_dark_source(dev->power.dpd, true); - else if (sysfs_streq(disabled, buf) && dev->power.dpd) - dpm_set_dark_source(dev->power.dpd, false); - else - return -EINVAL; - return n; -} - -static DEVICE_ATTR(dark_resume_source, 0644, - dark_resume_source_show, dark_resume_source_store); - #endif /* CONFIG_PM_SLEEP */ #ifdef CONFIG_PM_ADVANCED_DEBUG @@ -679,9 +632,7 @@ static struct attribute *wakeup_attrs[] = { #ifdef CONFIG_PM_AUTOSLEEP &dev_attr_wakeup_prevent_sleep_time_ms.attr, #endif - &dev_attr_dark_resume_active.attr, - &dev_attr_dark_resume_source.attr, -#endif /* CONFIG_PM_SLEEP */ +#endif NULL, }; static struct attribute_group pm_wakeup_attr_group = { |