regulator: core: avoid unused variable warning
authorArnd Bergmann <arnd@arndb.de>
Fri, 20 Nov 2015 14:24:39 +0000 (15:24 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 20 Nov 2015 18:04:34 +0000 (18:04 +0000)
commitfa731ac7ea04a7d3a5c6d2f568132478c02a83b3
tree0dcbbc22aa5caf40c7d5325c048486bde4e8cea8
parent8005c49d9aea74d382f474ce11afbbc7d7130bec
regulator: core: avoid unused variable warning

The second argument of the mutex_lock_nested() helper is only
evaluated if CONFIG_DEBUG_LOCK_ALLOC is set. Otherwise we
get this build warning for the new regulator_lock_supply
function:

drivers/regulator/core.c: In function 'regulator_lock_supply':
drivers/regulator/core.c:142:6: warning: unused variable 'i' [-Wunused-variable]

To avoid the warning, this restructures the code to make it
both simpler and to move the 'i++' outside of the mutex_lock_nested
call, where it is now always used and the variable is not
flagged as unused.

We had some discussion about changing mutex_lock_nested to an
inline function, which would make the code do the right thing here,
but in the end decided against it, in order to guarantee that
mutex_lock_nested() does not introduced overhead without
CONFIG_DEBUG_LOCK_ALLOC.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 9f01cd4a915 ("regulator: core: introduce function to lock regulators and its supplies")
Link: http://permalink.gmane.org/gmane.linux.kernel/2068900
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/core.c