From patchwork Tue Feb 10 08:11:14 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Nicholas Mc Guire <hofrat@osadl.org>
X-Patchwork-Id: 438292
Return-Path: <linux-i2c-owner@vger.kernel.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by ozlabs.org (Postfix) with ESMTP id 3D5251400A0
	for <incoming@patchwork.ozlabs.org>;
	Tue, 10 Feb 2015 19:15:51 +1100 (AEDT)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752250AbbBJIPt (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
	Tue, 10 Feb 2015 03:15:49 -0500
Received: from www.osadl.org ([62.245.132.105]:48943 "EHLO www.osadl.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751956AbbBJIPt (ORCPT <rfc822;linux-i2c@vger.kernel.org>);
	Tue, 10 Feb 2015 03:15:49 -0500
Received: from debian.hofrr.at (92-243-35-153.adsl.nanet.at [92.243.35.153]
	(may be forged))
	by www.osadl.org (8.13.8/8.13.8/OSADL-2007092901) with ESMTP id
	t1A8FDcM027765; Tue, 10 Feb 2015 09:15:13 +0100
From: Nicholas Mc Guire <hofrat@osadl.org>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
	Jisheng Zhang <jszhang@marvell.com>, Du Wenkai <wenkai.du@intel.com>,
	Shinya Kuribayashi <skuribay@pobox.com>,
	Romain Baeriswyl <Romain.Baeriswyl@abilis.com>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Andrew Jackson <Andrew.Jackson@arm.com>,
	David Box <david.e.box@linux.intel.com>,
	linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicholas Mc Guire <hofrat@osadl.org>
Subject: [PATCH v2] i2c: designware: fixup return handling of
	wait_for_completion_timeout
Date: Tue, 10 Feb 2015 03:11:14 -0500
Message-Id: <1423555874-19650-1-git-send-email-hofrat@osadl.org>
X-Mailer: git-send-email 1.7.10.4
X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00, KHOP_SC_TOP_CIDR8,
	RDNS_DYNAMIC autolearn=no version=3.3.1
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on www.osadl.org
Sender: linux-i2c-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-i2c.vger.kernel.org>
X-Mailing-List: linux-i2c@vger.kernel.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@osadl.org>
Reviewed-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---

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);