Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753343AbbBJIPu (ORCPT ); Tue, 10 Feb 2015 03:15:50 -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 ); Tue, 10 Feb 2015 03:15:49 -0500 From: Nicholas Mc Guire To: Wolfram Sang Cc: Mika Westerberg , Jisheng Zhang , Du Wenkai , Shinya Kuribayashi , Romain Baeriswyl , Jarkko Nikula , Andrew Jackson , David Box , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1774 Lines: 43 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 --- 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 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); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/