From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 8 Sep 2014 06:48:00 +0000 (+0200)
Subject: PM / sysfs: avoid shadowing variables
X-Git-Tag: fixes-against-v3.18-rc2~138^2~7^2~1^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b4f43131da08881423213dace0a514f325fe134;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed