[linux-yocto] [PATCH 20/34] i2c: designware: fixup return handling of wait_for_completion_timeout

wei.tee.ng at intel.com wei.tee.ng at intel.com
Mon Apr 27 20:20:45 PDT 2015

From: Nicholas Mc Guire <hofrat at osadl.org>

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 at osadl.org>
Reviewed-by: Jarkko Nikula <jarkko.nikula at linux.intel.com>
Signed-off-by: Wolfram Sang <wsa at the-dreams.de>
(cherry picked from commit 63d51e591931b878be7a16dacb37868a1e7ae8d1)

Signed-off-by: Ng Wei Tee <wei.tee.ng at intel.com>
 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)
 	/* 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 */

More information about the linux-yocto mailing list