From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760875AbbBIPIY (ORCPT ); Mon, 9 Feb 2015 10:08:24 -0500 Received: from www.osadl.org ([62.245.132.105]:43125 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759789AbbBIPIX (ORCPT ); Mon, 9 Feb 2015 10:08:23 -0500 From: Nicholas Mc Guire To: Michal Simek Cc: Soren Brinkmann , Wolfram Sang , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH v2] i2c: cadence: fixup of wait_for_completion_timeout return handling Date: Mon, 9 Feb 2015 10:03:52 -0500 Message-Id: <1423494232-24747-1-git-send-email-hofrat@osadl.org> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org return type of wait_for_completion_timeout is unsigned long not int. The return variable is renamed to reflect its use and the type adjusted to unsigned long. Signed-off-by: Nicholas Mc Guire --- v2: int ret is an idiom not only a declaration - thus rather than just changing the type, rename the variable, as suggested by Wolfram Sang . Patch was only compile tested with multi_v7_defconfig (implies CONFIG_I2C_CADENCE=y) Patch is against 3.19.0-rc7 (localversion-next is -next-20150209) drivers/i2c/busses/i2c-cadence.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c index 7d7a14c..8f92732f 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c @@ -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 timeout; 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) { + timeout = wait_for_completion_timeout(&id->xfer_done, adap->timeout); + if (!timeout) { cdns_i2c_master_reset(adap); dev_err(id->adap.dev.parent, "timeout waiting on completion\n"); -- 1.7.10.4