From patchwork Thu Jun 11 15:27:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Mc Guire X-Patchwork-Id: 483199 Return-Path: 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 5FA96140187 for ; Fri, 12 Jun 2015 01:37:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752448AbbFKPht (ORCPT ); Thu, 11 Jun 2015 11:37:49 -0400 Received: from www.osadl.org ([62.245.132.105]:44605 "EHLO www.osadl.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750AbbFKPhh (ORCPT ); Thu, 11 Jun 2015 11:37:37 -0400 Received: from debian.hofr.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 t5BFbKjf001720; Thu, 11 Jun 2015 17:37:20 +0200 From: Nicholas Mc Guire To: Wolfram Sang Cc: Thomas Petazzoni , Maxime Ripard , Andrew Lunn , Chen-Yu Tsai , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Nicholas Mc Guire Subject: [PATCH] i2c: mv64xxx: remove unreachable signal case handling Date: Thu, 11 Jun 2015 17:27:33 +0200 Message-Id: <1434036453-23336-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: X-Mailing-List: linux-i2c@vger.kernel.org 'commit d295a86eab20 ("i2c: mv64xxx: work around signals causing I2C transactions to be aborted")' removed the wait_event_interruptible_timeout to prevent half/mixed i2c messages from being sent/received but forgot to drop the signal received cases in the return handling. This just removes this dead code and simplifies the error message as "time_left" only can be 0 here and thus it conveys no additional information. Signed-off-by: Nicholas Mc Guire --- Patch was compile tested with multi_v7_defconfig (implies CONFIG_I2C_MV64XXX=y) Patch is against 4.1-rc7 (localversion-next is -next-20150611) drivers/i2c/busses/i2c-mv64xxx.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 30059c1..a4f8ece 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -534,7 +534,6 @@ mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data) { long time_left; unsigned long flags; - char abort = 0; time_left = wait_event_timeout(drv_data->waitq, !drv_data->block, drv_data->adapter.timeout); @@ -542,25 +541,17 @@ mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data) spin_lock_irqsave(&drv_data->lock, flags); if (!time_left) { /* Timed out */ drv_data->rc = -ETIMEDOUT; - abort = 1; - } else if (time_left < 0) { /* Interrupted/Error */ - drv_data->rc = time_left; /* errno value */ - abort = 1; - } - - if (abort && drv_data->block) { drv_data->aborting = 1; spin_unlock_irqrestore(&drv_data->lock, flags); time_left = wait_event_timeout(drv_data->waitq, !drv_data->block, drv_data->adapter.timeout); - if ((time_left <= 0) && drv_data->block) { + if (time_left == 0) { drv_data->state = MV64XXX_I2C_STATE_IDLE; dev_err(&drv_data->adapter.dev, - "mv64xxx: I2C bus locked, block: %d, " - "time_left: %d\n", drv_data->block, - (int)time_left); + "mv64xxx: I2C bus locked, block: %d\n", + drv_data->block); mv64xxx_i2c_hw_init(drv_data); } } else