From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755434AbbJIMgz (ORCPT ); Fri, 9 Oct 2015 08:36:55 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:65522 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755152AbbJIMgw (ORCPT ); Fri, 9 Oct 2015 08:36:52 -0400 From: Arnd Bergmann To: broonie@kernel.org Cc: Sascha Hauer , Liam Girdwood , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] regulator: core: avoid unused variable warning Date: Fri, 09 Oct 2015 14:36:47 +0200 Message-ID: <5130320.kXvB35QoYU@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:T7FeWaK+cw6K4W/EyF0tS/IdJXnOdcfUwqfOqvG11AgTObUt9Qg DosJrClV8gz6lV7kLeDdl+W8c1sBwmNMJwEsNL5VtViWQts8cqgm/kcb9DqOs4YykdEoC+7 +dVhNIXMY60bufEA3J5tcXWEHBHousvKUk2w+05+oIN+WHFoJ9PmNVFM/ZaHYGBy1Uz3Z79 GFz+s66b9J7PXbqJNoeTw== X-UI-Out-Filterresults: notjunk:1;V01:K0:xmBVMqB9MJE=:cWXeVUERc8UHZZpZFbyWjl Yza5eKBKu0mgPMtiUsLc7iLFbKQk+RdjlCrErX7vUvOjFmlUEZ7q8OYnmrQjPcVhrRbnjQFJL MRp0TBm2KbmNHfm05JgxF7DajOh4yvKAKi7yZ6TYvjKnRyxS2NHgiXm5H8JhfP6/nkrL1vANu yK4cuC6cpoJ6Y4gc0dpx/fY3KRFYjgQQiaGJ6kLNXnJ2MV4APUnoYT5TajDE/tgkT3bh15XjN 4gYi+XmCpFHtjYXAxn+0tfb01GC3a09hBssHPVs35LCsoyxQywLurFCUUiZXkOwAuEgmr9716 O/8NNwvCS4mNzp64b6fGgU0wA5qwNyklA/+t2eyPDinSXZDM7MDh9RnMwKKz9sw9WqIHcAW+H yw03LujvDcxlB2Z9VxRyQZOL+76UQTHztJrwHnevVZCfSAeushAECpqnFzWePEOOkQ/UicxoQ SU7lnSig573ToMFMkPCspXoCzaBVI5YwWw3lY5TR2FtL9U7KcndchG2IqKHCbR1N+mQhhJHVv thJcjmcO+hRCSo7Yuy/XXBAEYkgdF0bAuEJtDu2sh37fexAF7IKhnndc/JTexetkTuo0uOQl0 z4r51hm8gxCoC/UJt5yilCOScNP9/+pw6ldeiqdo4f8VPV+MXgGHqvcsWNhzQ1fdaKpxKhYwN aZoGVlcdSNmE8MfNLVGf+zak0uqB1dk8u64yWfBWJ60JT/JEmdh7h3bo8Q4AfEDO/WnVAIXrq CwZ9tmA+P5APp3xm Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 patch moves the postincrement outside of the call mutex_lock_nested(), which is enough to shut up gcc about it. Signed-off-by: Arnd Bergmann Fixes: 9f01cd4a915 ("regulator: core: introduce function to lock regulators and its supplies") diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 96dd7e1f1f28..bac8eefbfeff 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -142,7 +142,9 @@ static void __maybe_unused regulator_lock_supply(struct regulator_dev *rdev) int i = 0; while (1) { - mutex_lock_nested(&rdev->mutex, i++); + mutex_lock_nested(&rdev->mutex, i); + i++; + supply = rdev->supply; if (!rdev->supply)