]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
i2c: cadence: fixup wait_for_completion_timeout return handling
authorNicholas Mc Guire <hofrat@osadl.org>
Tue, 10 Feb 2015 16:55:10 +0000 (11:55 -0500)
committerWolfram Sang <wsa@the-dreams.de>
Sun, 15 Mar 2015 09:20:45 +0000 (10:20 +0100)
return type of wait_for_completion_timeout is unsigned long not int. The
return variable is renamed to make the timeout condition clearly readable
and the type adjusted to unsigned long.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-cadence.c

index 7d7a14cdadfb187d5fd4f95918146c8c6555443a..2ee78e099d3047de1096ebbb469dc561e589cce3 100644 (file)
@@ -475,7 +475,7 @@ static void cdns_i2c_master_reset(struct i2c_adapter *adap)
 static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,
                struct i2c_adapter *adap)
 {
-       int ret;
+       unsigned long time_left;
        u32 reg;
 
        id->p_msg = msg;
@@ -501,8 +501,8 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg,
                cdns_i2c_msend(id);
 
        /* Wait for the signal of completion */
-       ret = wait_for_completion_timeout(&id->xfer_done, adap->timeout);
-       if (!ret) {
+       time_left = wait_for_completion_timeout(&id->xfer_done, adap->timeout);
+       if (time_left == 0) {
                cdns_i2c_master_reset(adap);
                dev_err(id->adap.dev.parent,
                                "timeout waiting on completion\n");