From: Arnd Bergmann <arnd@arndb.de>
To: linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
dri-devel@lists.freedesktop.org, linux-ide@vger.kernel.org,
Tejun Heo <tj@kernel.org>,
Charles Keepax <ckeepax@opensource.wolfsonmicro.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Guenter Roeck <linux@roeck-us.net>,
linux-media@vger.kernel.org
Subject: [PATCH 13/14] iopoll: avoid -Wint-in-bool-context warning
Date: Fri, 14 Jul 2017 11:31:06 +0200 [thread overview]
Message-ID: <20170714093129.1366900-4-arnd@arndb.de> (raw)
In-Reply-To: <20170714092540.1217397-1-arnd@arndb.de>
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 <arnd@arndb.de>
---
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-07-14 9:34 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 9:25 [PATCH 00/14] gcc-7 warnings Arnd Bergmann
2017-07-14 9:25 ` [PATCH, RESEND 01/14] ide: avoid warning for timings calculation Arnd Bergmann
2017-07-14 9:25 ` [PATCH, RESEND 02/14] ata: avoid gcc-7 warning in ata_timing_quantize Arnd Bergmann
2017-07-15 10:56 ` Tejun Heo
2017-07-14 9:25 ` [PATCH, RESEND 03/14] drm/vmwgfx: avoid gcc-7 parentheses warning Arnd Bergmann
2017-07-14 10:11 ` Jani Nikula
2017-07-14 19:21 ` Linus Torvalds
2017-07-14 19:23 ` Linus Torvalds
2017-07-14 20:28 ` Arnd Bergmann
2017-07-17 13:15 ` Sinclair Yeh
2017-07-14 9:25 ` [PATCH 04/14] x86: math-emu: avoid -Wint-in-bool-context warning Arnd Bergmann
2017-07-14 9:25 ` [PATCH 05/14] isdn: isdnloop: suppress a gcc-7 warning Arnd Bergmann
2017-07-14 10:08 ` Joe Perches
2017-07-14 10:37 ` Arnd Bergmann
2017-07-15 4:20 ` Kevin Easton
2017-07-14 9:25 ` [PATCH 06/14] acpi: thermal: fix gcc-6/ccache warning Arnd Bergmann
2017-07-14 9:25 ` [PATCH 07/14] proc/kcore: hide a harmless warning Arnd Bergmann
2017-07-14 12:28 ` Ard Biesheuvel
2017-07-18 19:53 ` Arnd Bergmann
2017-07-18 19:55 ` Ard Biesheuvel
2017-07-18 20:01 ` Arnd Bergmann
2017-07-18 20:07 ` Ard Biesheuvel
2017-07-18 20:21 ` Arnd Bergmann
2017-07-14 9:25 ` [PATCH 08/14] Input: adxl34x - fix gcc-7 -Wint-in-bool-context warning Arnd Bergmann
2017-07-14 19:24 ` Linus Torvalds
2017-07-14 20:17 ` Arnd Bergmann
2017-07-14 21:40 ` Dmitry Torokhov
2017-07-14 9:30 ` [PATCH 09/14] SFI: fix tautological-compare warning Arnd Bergmann
2017-07-14 9:31 ` [PATCH 10/14] staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read Arnd Bergmann
2017-07-15 11:42 ` Jonathan Cameron
2017-07-14 9:31 ` [PATCH 11/14] IB/uverbs: fix gcc-7 type warning Arnd Bergmann
2017-07-14 9:46 ` Leon Romanovsky
2017-07-14 9:31 ` [PATCH 12/14] drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning Arnd Bergmann
2017-07-14 9:31 ` Arnd Bergmann [this message]
2017-07-14 9:55 ` [PATCH 13/14] iopoll: avoid " Joe Perches
2017-07-14 10:22 ` Arnd Bergmann
2017-07-14 9:36 ` [PATCH 14/14] [media] fix warning on v4l2_subdev_call() result interpreted as bool Arnd Bergmann
2017-07-14 12:05 ` Dan Carpenter
2017-07-14 12:27 ` Arnd Bergmann
2017-07-14 12:55 ` Dan Carpenter
2017-07-14 13:09 ` Dan Carpenter
2017-07-14 19:32 ` Arnd Bergmann
2017-07-14 12:41 ` Dan Carpenter
2017-07-17 13:45 ` Hans Verkuil
2017-07-17 14:26 ` Arnd Bergmann
2017-07-17 14:28 ` Dan Carpenter
2017-07-17 14:32 ` Hans Verkuil
2017-07-17 14:35 ` Hans Verkuil
2017-07-17 21:23 ` Arnd Bergmann
2017-07-14 10:29 ` [PATCH 00/14] gcc-7 warnings Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170714093129.1366900-4-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=akpm@linux-foundation.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=tj@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).