From patchwork Fri Aug 22 14:24:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 4765291 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 72B12C0338 for ; Fri, 22 Aug 2014 14:24:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2F9F2013A for ; Fri, 22 Aug 2014 14:24:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E22A9200DF for ; Fri, 22 Aug 2014 14:24:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756499AbaHVOY4 (ORCPT ); Fri, 22 Aug 2014 10:24:56 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:58593 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756366AbaHVOYz (ORCPT ); Fri, 22 Aug 2014 10:24:55 -0400 Received: by mail-la0-f49.google.com with SMTP id hz20so9811794lab.8 for ; Fri, 22 Aug 2014 07:24:53 -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=v7afNlnUk+QRlx52QlEp1yPFebYY1GzI9IBxmS1PdUA=; b=H+IvNNUqDaxpP0XXdtcqKB05i07yHl8N/fysgoh8wWcLvoKfRCa9M/8Ujvlu9GyuG6 NFtB+RN10TP2cwHRZ7YjHnjCJw1g0oTUtPOVDzRHVd0V1bPU0aKeXj9Cpu3O/xWFZ6FI M383ZGtcPC/ea86jh4RyisGYDcLEf8Z2QrmRylLSAE58T0sKw0Y+VGOEeV+8QHpQqT2C sDp8BDhO8d6Gj9nSE6JA/CO5YbC5aA7BZ1lQD0TIW3gVXggP++DJNBrlg4PXbCv1lxkf Co4kt4TTHcwI3uI4wdKzFklSGyyvGim1BSOmhAp3NqOPZLbsW7DehXrgoAeliNHzcTFL wfjQ== X-Gm-Message-State: ALoCoQnyD3uxLTuUb+4Vi0TbnOe44CjYpjp+grUfl//fZqZ2xvsFd9AYUSshC/UpXhco4nbzkWpy X-Received: by 10.152.205.9 with SMTP id lc9mr5005469lac.45.1408717493819; Fri, 22 Aug 2014 07:24:53 -0700 (PDT) Received: from wasted.cogentembedded.com (ppp26-47.pppoe.mtu-net.ru. [81.195.26.47]) by mx.google.com with ESMTPSA id mi10sm47272195lbc.19.2014.08.22.07.24.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Aug 2014 07:24:53 -0700 (PDT) From: Sergei Shtylyov To: wsa@the-dreams.de, linux-i2c@vger.kernel.org Cc: linux-sh@vger.kernel.org Subject: [PATCH 3/3] i2c-rcar: make rcar_i2c_irq_recv() *void* Date: Fri, 22 Aug 2014 18:24:50 +0400 Message-ID: <4284332.dM28a2HONX@wasted.cogentembedded.com> Organization: Cogent Embedded Inc. User-Agent: KMail/4.13.3 (Linux/3.15.10-200.fc20.x86_64; KDE/4.13.3; x86_64; ; ) In-Reply-To: <32018817.zX4x1fdR4T@wasted.cogentembedded.com> References: <32018817.zX4x1fdR4T@wasted.cogentembedded.com> MIME-Version: 1.0 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/i2c/busses/i2c-rcar.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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 @@ -317,7 +317,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; @@ -327,7 +327,7 @@ static int rcar_i2c_irq_recv(struct rcar * Do nothing */ if (!(msr & MDR)) - return 0; + return; if (msr & MAT) { /* @@ -354,8 +354,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) @@ -387,7 +385,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));