i2c: designware: fixup return handling of wait_for_completion_timeout
authorNicholas Mc Guire <hofrat@osadl.org>
Tue, 10 Feb 2015 08:11:14 +0000 (03:11 -0500)
committerWolfram Sang <wsa@the-dreams.de>
Sun, 15 Mar 2015 09:22:38 +0000 (10:22 +0100)
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>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-designware-core.c

index 6e25c010e69037a544ad04f82df46e27e80ca9af..6f19a33773fe79dd4ef27643232b2df1e5bba66b 100644 (file)
@@ -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);