* [PATCH v2] i2c: designware: fixup return handling of wait_for_completion_timeout
@ 2015-02-10 8:11 Nicholas Mc Guire
2015-02-10 8:31 ` Jarkko Nikula
2015-03-15 9:23 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Nicholas Mc Guire @ 2015-02-10 8:11 UTC (permalink / raw)
To: Wolfram Sang
Cc: Mika Westerberg, Jisheng Zhang, Du Wenkai, Shinya Kuribayashi,
Romain Baeriswyl, Jarkko Nikula, Andrew Jackson, David Box,
linux-i2c, linux-kernel, Nicholas Mc Guire
return type of wait_for_completion_timeout is unsigned long not int, rather
than introducing a new variable the wait_for_completion_timeout is moved
into the if condition as the return value is only used to detect timeout.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
v2: Aside from the newly added variable having the wrong type (...) the
preferred solution is to simply wrap wait_for_completion_timeout into
the condition as the remaining jiffies is actually not used - suggested
be Jarkko Nikula <jarkko.nikula@linux.intel.com.
Patch was compile tested with x86_64_defconfig +
CONFIG_X86_AMD_PLATFORM_DEVICE=y, CONFIG_I2C_DESIGNWARE_PLATFORM=m
(implies CONFIG_I2C_DESIGNWARE_CORE=y)
Patch is against 3.19.0-rc7 (localversion-next is -next-20150209)
drivers/i2c/busses/i2c-designware-core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 6e25c01..6f19a33 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -656,8 +656,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
i2c_dw_xfer_init(dev);
/* wait for tx to complete */
- ret = wait_for_completion_timeout(&dev->cmd_complete, HZ);
- if (ret == 0) {
+ if (!wait_for_completion_timeout(&dev->cmd_complete, HZ)) {
dev_err(dev->dev, "controller timed out\n");
/* i2c_dw_init implicitly disables the adapter */
i2c_dw_init(dev);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] i2c: designware: fixup return handling of wait_for_completion_timeout
2015-02-10 8:11 [PATCH v2] i2c: designware: fixup return handling of wait_for_completion_timeout Nicholas Mc Guire
@ 2015-02-10 8:31 ` Jarkko Nikula
2015-03-15 9:23 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Jarkko Nikula @ 2015-02-10 8:31 UTC (permalink / raw)
To: Nicholas Mc Guire, Wolfram Sang
Cc: Mika Westerberg, Jisheng Zhang, Du Wenkai, Shinya Kuribayashi,
Romain Baeriswyl, Andrew Jackson, David Box, linux-i2c,
linux-kernel
On 02/10/2015 10:11 AM, Nicholas Mc Guire wrote:
> return type of wait_for_completion_timeout is unsigned long not int, rather
> than introducing a new variable the wait_for_completion_timeout is moved
> into the if condition as the return value is only used to detect timeout.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> ---
>
> v2: Aside from the newly added variable having the wrong type (...) the
> preferred solution is to simply wrap wait_for_completion_timeout into
> the condition as the remaining jiffies is actually not used - suggested
> be Jarkko Nikula <jarkko.nikula@linux.intel.com.
>
> Patch was compile tested with x86_64_defconfig +
> CONFIG_X86_AMD_PLATFORM_DEVICE=y, CONFIG_I2C_DESIGNWARE_PLATFORM=m
> (implies CONFIG_I2C_DESIGNWARE_CORE=y)
>
> Patch is against 3.19.0-rc7 (localversion-next is -next-20150209)
>
> drivers/i2c/busses/i2c-designware-core.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
> index 6e25c01..6f19a33 100644
> --- a/drivers/i2c/busses/i2c-designware-core.c
> +++ b/drivers/i2c/busses/i2c-designware-core.c
> @@ -656,8 +656,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
> i2c_dw_xfer_init(dev);
>
> /* wait for tx to complete */
> - ret = wait_for_completion_timeout(&dev->cmd_complete, HZ);
> - if (ret == 0) {
> + if (!wait_for_completion_timeout(&dev->cmd_complete, HZ)) {
> dev_err(dev->dev, "controller timed out\n");
> /* i2c_dw_init implicitly disables the adapter */
> i2c_dw_init(dev);
>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] i2c: designware: fixup return handling of wait_for_completion_timeout
2015-02-10 8:11 [PATCH v2] i2c: designware: fixup return handling of wait_for_completion_timeout Nicholas Mc Guire
2015-02-10 8:31 ` Jarkko Nikula
@ 2015-03-15 9:23 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2015-03-15 9:23 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Mika Westerberg, Jisheng Zhang, Du Wenkai, Shinya Kuribayashi,
Romain Baeriswyl, Jarkko Nikula, Andrew Jackson, David Box,
linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
On Tue, Feb 10, 2015 at 03:11:14AM -0500, Nicholas Mc Guire wrote:
> return type of wait_for_completion_timeout is unsigned long not int, rather
> than introducing a new variable the wait_for_completion_timeout is moved
> into the if condition as the return value is only used to detect timeout.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Applied to for-next, thanks!
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-15 9:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-10 8:11 [PATCH v2] i2c: designware: fixup return handling of wait_for_completion_timeout Nicholas Mc Guire
2015-02-10 8:31 ` Jarkko Nikula
2015-03-15 9:23 ` Wolfram Sang
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).