openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

PM / sysfs: avoid shadowing variables 

The global variable "enabled" is shadowed in a number of
functions in this file, rename it to "_enabled" to avoid
that. For consistency, also rename "disabled" and move
them both into the #ifdef where they're needed.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Johannes Berg 2014-09-08 08:48:00 +02:00 committed by Rafael J. Wysocki
parent 2ce7598c9a
commit 2b4f43131d
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/base/power/sysfs.c
View File

@ -92,9 +92,6 @@
* wakeup_count - Report the number of wakeup events related to the device * wakeup_count - Report the number of wakeup events related to the device
*/ */
static const char enabled[] = "enabled";
static const char disabled[] = "disabled";
const char power_group_name[] = "power"; const char power_group_name[] = "power";
EXPORT_SYMBOL_GPL(power_group_name); EXPORT_SYMBOL_GPL(power_group_name);
@ -336,11 +333,14 @@ static DEVICE_ATTR(pm_qos_remote_wakeup, 0644,
#endif /* CONFIG_PM_RUNTIME */ #endif /* CONFIG_PM_RUNTIME */
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static const char _enabled[] = "enabled";
static const char _disabled[] = "disabled";
static ssize_t static ssize_t
wake_show(struct device * dev, struct device_attribute *attr, char * buf) wake_show(struct device * dev, struct device_attribute *attr, char * buf)
{ {
return sprintf(buf, "%s\n", device_can_wakeup(dev) return sprintf(buf, "%s\n", device_can_wakeup(dev)
? (device_may_wakeup(dev) ? enabled : disabled) ? (device_may_wakeup(dev) ? _enabled : _disabled)
: ""); : "");
} }
@ -357,11 +357,11 @@ wake_store(struct device * dev, struct device_attribute *attr,
cp = memchr(buf, '\n', n); cp = memchr(buf, '\n', n);
if (cp) if (cp)
len = cp - buf; len = cp - buf;
if (len == sizeof enabled - 1 if (len == sizeof _enabled - 1
&& strncmp(buf, enabled, sizeof enabled - 1) == 0) && strncmp(buf, _enabled, sizeof _enabled - 1) == 0)
device_set_wakeup_enable(dev, 1); device_set_wakeup_enable(dev, 1);
else if (len == sizeof disabled - 1 else if (len == sizeof _disabled - 1
&& strncmp(buf, disabled, sizeof disabled - 1) == 0) && strncmp(buf, _disabled, sizeof _disabled - 1) == 0)
device_set_wakeup_enable(dev, 0); device_set_wakeup_enable(dev, 0);
else else
return -EINVAL; return -EINVAL;
@ -570,7 +570,8 @@ static ssize_t async_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
return sprintf(buf, "%s\n", return sprintf(buf, "%s\n",
device_async_suspend_enabled(dev) ? enabled : disabled); device_async_suspend_enabled(dev) ?
_enabled : _disabled);
} }
static ssize_t async_store(struct device *dev, struct device_attribute *attr, static ssize_t async_store(struct device *dev, struct device_attribute *attr,
@ -582,9 +583,10 @@ static ssize_t async_store(struct device *dev, struct device_attribute *attr,
cp = memchr(buf, '\n', n); cp = memchr(buf, '\n', n);
if (cp) if (cp)
len = cp - buf; len = cp - buf;
if (len == sizeof enabled - 1 && strncmp(buf, enabled, len) == 0) if (len == sizeof _enabled - 1 && strncmp(buf, _enabled, len) == 0)
device_enable_async_suspend(dev); device_enable_async_suspend(dev);
else if (len == sizeof disabled - 1 && strncmp(buf, disabled, len) == 0) else if (len == sizeof _disabled - 1 &&
strncmp(buf, _disabled, len) == 0)
device_disable_async_suspend(dev); device_disable_async_suspend(dev);
else else
return -EINVAL; return -EINVAL;