PM / sysfs: avoid shadowing variables
authorJohannes Berg <johannes.berg@intel.com>
Mon, 8 Sep 2014 06:48:00 +0000 (08:48 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Sep 2014 13:40:18 +0000 (15:40 +0200)
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>
drivers/base/power/sysfs.c

Simple merge