From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH 13/14] iopoll: avoid -Wint-in-bool-context warning Date: Fri, 14 Jul 2017 11:31:06 +0200 Message-ID: <20170714093129.1366900-4-arnd@arndb.de> References: <20170714092540.1217397-1-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, Mark Brown , Andrew Morton Cc: Arnd Bergmann , Masahiro Yamada , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, linux-ide@vger.kernel.org, Tejun Heo , Charles Keepax , Linus Torvalds , Guenter Roeck , linux-media@vger.kernel.org List-Id: linux-ide@vger.kernel.org V2hlbiB3ZSBwYXNzIHRoZSByZXN1bHQgb2YgYSBtdWx0aXBsaWNhdGlvbiBhcyB0aGUgdGltZW91 dCwgd2UKY2FuIGdldCBhIHdhcm5pbmc6Cgpkcml2ZXJzL21tYy9ob3N0L2JjbTI4MzUuYzo1OTY6 MTQ5OiBlcnJvcjogJyonIGluIGJvb2xlYW4gY29udGV4dCwgc3VnZ2VzdCAnJiYnIGluc3RlYWQg Wy1XZXJyb3I9aW50LWluLWJvb2wtY29udGV4dF0KZHJpdmVycy9tZmQvYXJpem9uYS1jb3JlLmM6 MjQ3OjE5NTogZXJyb3I6ICcqJyBpbiBib29sZWFuIGNvbnRleHQsIHN1Z2dlc3QgJyYmJyBpbnN0 ZWFkIFstV2Vycm9yPWludC1pbi1ib29sLWNvbnRleHRdCgpUaGlzIGlzIGVhc3kgdG8gYXZvaWQg YnkgY29tcGFyaW5nIHRoZSB0aW1lb3V0IHRvIHplcm8gaW5zdGVhZCwKbWFraW5nIGl0IGEgYm9v bGVhbiBleHByZXNzaW9uLgoKU2lnbmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8YXJuZEBhcm5k Yi5kZT4KLS0tCiBpbmNsdWRlL2xpbnV4L2lvcG9sbC5oIHwgNiArKysrLS0KIGluY2x1ZGUvbGlu dXgvcmVnbWFwLmggfCAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMyBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L2lvcG9sbC5oIGIvaW5jbHVk ZS9saW51eC9pb3BvbGwuaAppbmRleCBkMjllMWUyMWJmM2YuLjdhMTdiYTAyMjUzYiAxMDA2NDQK LS0tIGEvaW5jbHVkZS9saW51eC9pb3BvbGwuaAorKysgYi9pbmNsdWRlL2xpbnV4L2lvcG9sbC5o CkBAIC00OCw3ICs0OCw4IEBACiAJCSh2YWwpID0gb3AoYWRkcik7IFwKIAkJaWYgKGNvbmQpIFwK IAkJCWJyZWFrOyBcCi0JCWlmICh0aW1lb3V0X3VzICYmIGt0aW1lX2NvbXBhcmUoa3RpbWVfZ2V0 KCksIHRpbWVvdXQpID4gMCkgeyBcCisJCWlmICgodGltZW91dF91cykgPiAwICYmIFwKKwkJICAg IGt0aW1lX2NvbXBhcmUoa3RpbWVfZ2V0KCksIHRpbWVvdXQpID4gMCkgeyBcCiAJCQkodmFsKSA9 IG9wKGFkZHIpOyBcCiAJCQlicmVhazsgXAogCQl9IFwKQEAgLTgyLDcgKzgzLDggQEAKIAkJKHZh bCkgPSBvcChhZGRyKTsgXAogCQlpZiAoY29uZCkgXAogCQkJYnJlYWs7IFwKLQkJaWYgKHRpbWVv dXRfdXMgJiYga3RpbWVfY29tcGFyZShrdGltZV9nZXQoKSwgdGltZW91dCkgPiAwKSB7IFwKKwkJ aWYgKCh0aW1lb3V0X3VzKSA+IDAgJiYgXAorCQkgICAga3RpbWVfY29tcGFyZShrdGltZV9nZXQo KSwgdGltZW91dCkgPiAwKSB7IFwKIAkJCSh2YWwpID0gb3AoYWRkcik7IFwKIAkJCWJyZWFrOyBc CiAJCX0gXApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9yZWdtYXAuaCBiL2luY2x1ZGUvbGlu dXgvcmVnbWFwLmgKaW5kZXggMTQ3NGFiMGEzOTIyLi4wODg5ZGJmMzcxNjEgMTAwNjQ0Ci0tLSBh L2luY2x1ZGUvbGludXgvcmVnbWFwLmgKKysrIGIvaW5jbHVkZS9saW51eC9yZWdtYXAuaApAQCAt MTI5LDcgKzEyOSw3IEBAIHN0cnVjdCByZWdfc2VxdWVuY2UgewogCQkJYnJlYWs7IFwKIAkJaWYg KGNvbmQpIFwKIAkJCWJyZWFrOyBcCi0JCWlmICgodGltZW91dF91cykgJiYgXAorCQlpZiAoKHRp bWVvdXRfdXMpID4gMCAmJiBcCiAJCSAgICBrdGltZV9jb21wYXJlKGt0aW1lX2dldCgpLCBfX3Rp bWVvdXQpID4gMCkgeyBcCiAJCQlfX3JldCA9IHJlZ21hcF9yZWFkKChtYXApLCAoYWRkciksICYo dmFsKSk7IFwKIAkJCWJyZWFrOyBcCi0tIAoyLjkuMAoKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753854AbdGNJeN (ORCPT ); Fri, 14 Jul 2017 05:34:13 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:57062 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751353AbdGNJeM (ORCPT ); Fri, 14 Jul 2017 05:34:12 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Mark Brown , Andrew Morton Cc: Greg Kroah-Hartman , Linus Torvalds , Tejun Heo , Guenter Roeck , linux-ide@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Arnd Bergmann , Masahiro Yamada , Charles Keepax Subject: [PATCH 13/14] iopoll: avoid -Wint-in-bool-context warning Date: Fri, 14 Jul 2017 11:31:06 +0200 Message-Id: <20170714093129.1366900-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de> References: <20170714092540.1217397-1-arnd@arndb.de> X-Provags-ID: V03:K0:tnnYrfDDRfyG4HcqDwJLN4aLSknRSBuE/z7rCtZunbNl6HzWrdn Mluxjv41oMw9kwhLb54mqwTidWsf38sM6CvJ4fuWf8M/wN0AaByeJYzdOPk2iSRGxrWgYKq 70gphy5QwCukuiFJA/UeqJk0/58LDGWxrW5cH/JW9ZICXsb8ov2Tb0Kp0GTKMBNsv3o+BGZ P/GbdgBmZYltGEZGXhODA== X-UI-Out-Filterresults: notjunk:1;V01:K0:oR92X5Y4ipE=:tD0IaQagf+0Gu0E6CtDsuI IysTN4ZNHEIpgPothGAihexoW5kpXKo83XzA1No+v76N6BuZFHoJ2WROrucjmUuYFLSFNpDnH 4syQcaerNFk9WNDtBRRJwe8DnsraBRsRI3QoaXHxQhnYk4OLdiy2Gbda+Bhm8RbJ/ONRvcpHI UqEqjy8oHnM4CfwpkQqGhd3eCFzeRma26zjgZD185AAPMCeOirC5V+cw6zTeuegaRaifMf43p ohUDbinpJU1kkiYOsnBu92WuJQhjmcIflCjF0UEFMkzeO2zLddFR9w/HqTwQMnKnCIImSetlm mDprivMtth1mAa4f6qIXzFPev33PDUHuxZ5ZYjNGlEgfkOk1FXxuOvY6o5mfDVgcMtLXj8QwZ HzzSDlWnDqbqNk1++r3TJZb6GGQjcPtFLgPnJruxyuvz6lcV8E8ttOQMY2jXnePJLwDWTJeKc nWXPfSh/88sdRuhW9b1oEJhj7Z8nQS2d4iNPX0TnBgU+qfl7OzrRq07D1FkLVTozJJQiVguRB hR0TUCs6mVceaoszmtDiWeVI3au1zUgbyZzckfnpv+R4N05I37NYCi/24fECXYaIPQFZDNmWP WRwXHvEoXsGrvrXCvrCAAI+6l5tX69FWQM09n1mGnnzmG4Q5AUqab1AFXr4jlPaO3p9dXzSU9 jC2cG+361Hkc+WDKnI6W65dGEFN4X0a6tra23w72izQIDnBYzVGLjHaTSCUi3zqThWU+58eTi CFydOnPXlYVl66urk75cTeWL7Jw9Udlzftwjww== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we pass the result of a multiplication as the timeout, we can get a warning: drivers/mmc/host/bcm2835.c:596:149: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] drivers/mfd/arizona-core.c:247:195: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] This is easy to avoid by comparing the timeout to zero instead, making it a boolean expression. Signed-off-by: Arnd Bergmann --- include/linux/iopoll.h | 6 ++++-- include/linux/regmap.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index d29e1e21bf3f..7a17ba02253b 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -48,7 +48,8 @@ (val) = op(addr); \ if (cond) \ break; \ - if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \ + if ((timeout_us) > 0 && \ + ktime_compare(ktime_get(), timeout) > 0) { \ (val) = op(addr); \ break; \ } \ @@ -82,7 +83,8 @@ (val) = op(addr); \ if (cond) \ break; \ - if (timeout_us && ktime_compare(ktime_get(), timeout) > 0) { \ + if ((timeout_us) > 0 && \ + ktime_compare(ktime_get(), timeout) > 0) { \ (val) = op(addr); \ break; \ } \ diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 1474ab0a3922..0889dbf37161 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -129,7 +129,7 @@ struct reg_sequence { break; \ if (cond) \ break; \ - if ((timeout_us) && \ + if ((timeout_us) > 0 && \ ktime_compare(ktime_get(), __timeout) > 0) { \ __ret = regmap_read((map), (addr), &(val)); \ break; \ -- 2.9.0