From patchwork Sun Sep 14 20:17:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 389131 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 9BBAB1400D5 for ; Mon, 15 Sep 2014 07:13:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752842AbaINVNQ (ORCPT ); Sun, 14 Sep 2014 17:13:16 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:60056 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752843AbaINVNQ (ORCPT ); Sun, 14 Sep 2014 17:13:16 -0400 Received: by mail-wg0-f46.google.com with SMTP id n12so3030124wgh.5 for ; Sun, 14 Sep 2014 14:13:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:organization :user-agent:in-reply-to:references:mime-version :content-transfer-encoding:content-type; bh=mP/2raNI1ijCEz1xowlMZH1J4/E4/5O2tt3mOD+9wUc=; b=TQjBkhgpuObElrRUcsa42GfIgilqtM+Woc9I4wCB53XuvDt0wq5EC6eHZGn/aRa72r rtQi0Vabk9HuXIeTJdLFlTa7z7+d7xZZJpj5jtajXwFImmkj5ogfI6WO/HTZAuRgTe6M WflrRXMkstTP53EpGKKBqeG9XtrDndotHf3sPq7E5xYqZH1hQIz42Gmb73Fx/jwigz9u 16Z6E/dD/RGo3SqxAhQHbNPHpw1HtZNyiyHd3QZ2+UQJXi9irlAfzvEzXqnT2MkdZC7K xmoGBUR8E2KGJrCUg/HjmBA2GTUmTzs9lDincXgbyj/gwBMVenJDTI08R0rpuAv61byU mE4Q== X-Gm-Message-State: ALoCoQkXA6wobpezCXeEdfNCbp449TDNatCBGm5Xmn9U41puSIbHLNSl21UHeBNVNPCwDSGnJo8K X-Received: by 10.194.172.137 with SMTP id bc9mr28995321wjc.72.1410729194943; Sun, 14 Sep 2014 14:13:14 -0700 (PDT) Received: from wasted.cogentembedded.com (80.178.206.101.adsl.012.net.il. [80.178.206.101]) by mx.google.com with ESMTPSA id r19sm9468770wik.0.2014.09.14.14.13.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Sep 2014 14:13:14 -0700 (PDT) From: Sergei Shtylyov To: wsa@the-dreams.de, linux-i2c@vger.kernel.org Cc: linux-sh@vger.kernel.org Subject: [PATCH v2 3/3] i2c-rcar: make rcar_i2c_irq_recv() *void* Date: Mon, 15 Sep 2014 00:17:34 +0400 Message-ID: <19871938.mRdZLUD6Mv@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.13.3 (Linux/3.15.10-201.fc20.x86_64; KDE/4.13.3; x86_64; ; ) In-Reply-To: <2245366.q99HVYG3pL@wasted.cogentembedded.com> References: <2245366.q99HVYG3pL@wasted.cogentembedded.com> MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org rcar_i2c_irq_recv() always returns 0, so we can make this function return *void* and also remove rcar_i2c_flags_set() invocation in rcar_i2c_irq(). Signed-off-by: Sergei Shtylyov --- Changes in version 2: - refreshed patch. drivers/i2c/busses/i2c-rcar.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux/drivers/i2c/busses/i2c-rcar.c =================================================================== --- linux.orig/drivers/i2c/busses/i2c-rcar.c +++ linux/drivers/i2c/busses/i2c-rcar.c @@ -319,7 +319,7 @@ static int rcar_i2c_irq_send(struct rcar return 0; } -static int rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr) +static void rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr) { struct i2c_msg *msg = priv->msg; @@ -329,7 +329,7 @@ static int rcar_i2c_irq_recv(struct rcar * Do nothing */ if (!(msr & MDR)) - return 0; + return; if (msr & MAT) { /* @@ -356,8 +356,6 @@ static int rcar_i2c_irq_recv(struct rcar rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_DATA); rcar_i2c_write(priv, ICMSR, RCAR_IRQ_ACK_RECV); - - return 0; } static irqreturn_t rcar_i2c_irq(int irq, void *ptr) @@ -395,7 +393,7 @@ static irqreturn_t rcar_i2c_irq(int irq, } if (rcar_i2c_is_recv(priv)) - rcar_i2c_flags_set(priv, rcar_i2c_irq_recv(priv, msr)); + rcar_i2c_irq_recv(priv, msr); else rcar_i2c_flags_set(priv, rcar_i2c_irq_send(priv, msr));