From patchwork Tue Jul 14 07:36:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 51095 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 342B4202B9 for ; Tue, 14 Jul 2015 07:42:07 +0000 (UTC) Received: by wizo10 with SMTP id o10sf2445397wiz.0 for ; Tue, 14 Jul 2015 00:42:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=hpB0A6h0U4MR8SYSqX+vHW3xGTHK/NiDyX0CpLpbkVU=; b=JYtcRPTqkrHCwBbWQLHiCQFBhFiqayrriHMslENQvXWOg+I4TAKFAyreAnWQY8OTpK nKIa+Bc8Rk0B2nK6fMnFF7IeItF+qges63BSk8dWwZFzn59HmuHH97+rwVObWJWvuZTe yAmQ5TeeQcY+LdyexOwkmE7/pNJxOUQEZ+lAC44328BUx4BFGWBArJtYaG1G5S1G2B6R axOzT+KaxNr9xj2mil0BhgwZQmlh0c+mJuCyw3H19GFGQsJqt3fPbtP1QMzqiEnLCo+B MZRiW7M8OTzJDjDmZ37uuBlLjkH2TrIrMZECZV2GE+AbGthQeLs3VMtd7XWGb96pme9O Cbfg== X-Gm-Message-State: ALoCoQkxRlUNf5MZ059SwLLq/RbB8f5v4a/paNboVNnmn19rIteVPURn/ob4R+vcc7ckKrRSXKJv X-Received: by 10.194.209.180 with SMTP id mn20mr20713514wjc.5.1436859726466; Tue, 14 Jul 2015 00:42:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.179.39 with SMTP id dd7ls8103lac.60.gmail; Tue, 14 Jul 2015 00:42:06 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr36115826lbb.36.1436859726278; Tue, 14 Jul 2015 00:42:06 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id l9si132662laf.165.2015.07.14.00.42.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 00:42:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lblf12 with SMTP id f12so1110756lbl.2 for ; Tue, 14 Jul 2015 00:42:06 -0700 (PDT) X-Received: by 10.152.42.177 with SMTP id p17mr36012934lal.29.1436859725990; Tue, 14 Jul 2015 00:42:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2196217lbb; Tue, 14 Jul 2015 00:42:04 -0700 (PDT) X-Received: by 10.70.135.67 with SMTP id pq3mr77815392pdb.8.1436859722717; Tue, 14 Jul 2015 00:42:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e4si260485pdn.255.2015.07.14.00.42.01; Tue, 14 Jul 2015 00:42:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753507AbbGNHmA (ORCPT + 26 others); Tue, 14 Jul 2015 03:42:00 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:32980 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753152AbbGNHjU (ORCPT ); Tue, 14 Jul 2015 03:39:20 -0400 Received: by pdbqm3 with SMTP id qm3so1420665pdb.0 for ; Tue, 14 Jul 2015 00:39:20 -0700 (PDT) X-Received: by 10.66.141.137 with SMTP id ro9mr76063670pab.152.1436859560407; Tue, 14 Jul 2015 00:39:20 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by smtp.gmail.com with ESMTPSA id pe3sm275937pdb.55.2015.07.14.00.39.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Jul 2015 00:39:19 -0700 (PDT) From: Vaibhav Hiremath To: linux-i2c@vger.kernel.org Cc: wsa@the-dreams.de, robh+dt@kernel.org, robert.jarzmik@free.fr, yizhang@marvell.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Shouming Wang , Vaibhav Hiremath Subject: [PATCH-v4 03/11] i2c: pxa: Return I2C_RETRY when timeout in pio mode Date: Tue, 14 Jul 2015 13:06:42 +0530 Message-Id: <1436859410-28878-4-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436859410-28878-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436859410-28878-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vaibhav.hiremath@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Shouming Wang In case of timeout in pio mode of operation return I2C_RETRY. This behavior will be same as interrupt mode of operation. Signed-off-by: Shouming Wang [vaibhav.hiremath@linaro.org: Updated changelog] Signed-off-by: Vaibhav Hiremath Acked-by: Robert Jarzmik --- drivers/i2c/busses/i2c-pxa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 023e59f..632008f 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -745,8 +745,10 @@ static int i2c_pxa_do_pio_xfer(struct pxa_i2c *i2c, ret = i2c->msg_idx; out: - if (timeout == 0) + if (timeout == 0) { i2c_pxa_scream_blue_murder(i2c, "timeout"); + ret = I2C_RETRY; + } return ret; }