From patchwork Sat Mar 11 18:24:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9618925 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 31BA9604CC for ; Sat, 11 Mar 2017 18:25:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29FDC28678 for ; Sat, 11 Mar 2017 18:25:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EB7928722; Sat, 11 Mar 2017 18:25:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D039E28678 for ; Sat, 11 Mar 2017 18:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:To:Subject:From:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9OFVDMMQzmmohE+acfKBVtIycb//SfHyQc0ZhsryLSU=; b=kxuEPcgwjEA1F3 hUt4xQOPfW1DIqZkksMRibLo1u2uLN66lOs6OXibsoy2Sk6Xzq0vOTxFlC6PtU5WBBGpQXiiKuftu 1UfEGokVAEwZH0ZIBbuINSe6cCT5mTluwg6BKjgJ2WZRlqsv7v0OA9G7XZoioC8KkpUyFua94fRkl wRsunC+GDmxzAIwwI+Uar2lYUjwXXQpFS3tycU7q9YLIoDOUUlFpX7nXPw58xVAlDe5OlQIyZHKN1 40bEtL5bhqwmqApon75Wi5g5e3IkZkzngvhr3V17JAnno88SMAi5JVynk06T8FSVMBJLXHV0WKAJy f4tAjIboDxYRYBluJhQg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cmlhf-0002Eo-3T; Sat, 11 Mar 2017 18:25:19 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cmlhX-0000sW-2R for linux-amlogic@lists.infradead.org; Sat, 11 Mar 2017 18:25:13 +0000 Received: by mail-wr0-x243.google.com with SMTP id u48so15309993wrc.1 for ; Sat, 11 Mar 2017 10:24:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=MVWZKaNwYL5Z4JfCFvtp5phG9Y1GD4wnppZu57fjz0A=; b=pr/WpzT+d9PmCI6ECD0Ma2AXNmIvEJoAmagFLqsJLpxZV3EdZZcJbdkX7ZGp6E29Zl 3uYlB8EqKMbfUyo7IPn7M1f8mwEfqNo27HLLeVlRHezHSjP5FtsltP1SX3cwY1j5nzTe 61eOIqIRXAdBEPYrtVx+g6JX4qxbCMcNsc1cXzkJJbj3XtmcfSLlQP3W4ofiF2z3U4UF J64B/3QD7nn043lfPCrjwVLClIA+03DRDV0EA0Owzj3Yw+q0z1aabVeelYrzRkLJXPCx Jye8A+Q6Fx1+fXl2WW8pcz8pPE2oxVUD32ePPjM5zOWPC11f4XXTjMi9TpLmt8rpsfLE FhSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=MVWZKaNwYL5Z4JfCFvtp5phG9Y1GD4wnppZu57fjz0A=; b=dk5wVgFHSfk8fIwWAuY2IrPtNsRU8mMgcSrTRKObxRbsk9HaWLz1wE9au+Fvdc/tgK Rfo50y4E+ejspxPpDY6UBSpGCpi5GLtW6KgKN/WbvjQucOYc2ww4+FsnYHshyKLxyfrO q9Tg5nHwDRXYX6vp4xLEbvPTfMa8YBpx3SzwYGUGZTSO0otBWJunFU/jrMDLMTXF1hjc 0uYToUS5ncJQdW8Frh9w+4hfVnMxZ8SuhM2WdmclM87BiJKUp+Lu7GrpC7HcLP5inc+l jlGU56kpB+sMNpC/Px2txAfOn2jTv25qHinS2BCg+P5XNAb8Ld+DRxk1SLP70TLJ6tRS sLag== X-Gm-Message-State: AMke39mMQyASmE73asugk8o7hXN1sXoyK6GjVtnOJBEj4suj1KII4w4preEy3wh3pdExlA== X-Received: by 10.223.132.163 with SMTP id 32mr21485374wrg.147.1489256694037; Sat, 11 Mar 2017 10:24:54 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:3419:a191:120:8b2e? (p200300C6EBDC40003419A19101208B2E.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:3419:a191:120:8b2e]) by smtp.googlemail.com with ESMTPSA id x18sm4503207wmd.14.2017.03.11.10.24.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Mar 2017 10:24:53 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v3 09/10] i2c: meson: remove meson_i2c_write_tokens To: Wolfram Sang , Jerome Brunet References: Message-ID: <5f2c80cc-dfe8-cfe2-90a0-8f5c63522f2a@gmail.com> Date: Sat, 11 Mar 2017 19:24:18 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170311_102511_584043_C7F0B650 X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, "linux-i2c@vger.kernel.org" Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP meson_i2c_write_tokens is always called directly after meson_i2c_prepare_xfer (and only then). So we can simplify the code by removing meson_i2c_write_tokens and moving the two statements of meson_i2c_write_tokens to the end of meson_i2c_prepare_xfer. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - no changes --- drivers/i2c/busses/i2c-meson.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c index 6c873ed8..23f25efa 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -123,12 +123,6 @@ static void meson_i2c_add_token(struct meson_i2c *i2c, int token) i2c->num_tokens++; } -static void meson_i2c_write_tokens(struct meson_i2c *i2c) -{ - writel(i2c->tokens[0], i2c->regs + REG_TOK_LIST0); - writel(i2c->tokens[1], i2c->regs + REG_TOK_LIST1); -} - static void meson_i2c_set_clk_div(struct meson_i2c *i2c, unsigned int freq) { unsigned long clk_rate = clk_get_rate(i2c->clk); @@ -207,6 +201,9 @@ static void meson_i2c_prepare_xfer(struct meson_i2c *i2c) if (i2c->last && i2c->pos + i2c->count >= i2c->msg->len) meson_i2c_add_token(i2c, TOKEN_STOP); + + writel(i2c->tokens[0], i2c->regs + REG_TOK_LIST0); + writel(i2c->tokens[1], i2c->regs + REG_TOK_LIST1); } static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) @@ -272,12 +269,10 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) } out: - if (i2c->state != STATE_IDLE) { + if (i2c->state != STATE_IDLE) /* Restart the processing */ - meson_i2c_write_tokens(i2c); meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, REG_CTRL_START); - } spin_unlock(&i2c->lock); @@ -318,7 +313,6 @@ static int meson_i2c_xfer_msg(struct meson_i2c *i2c, struct i2c_msg *msg, i2c->state = (msg->flags & I2C_M_RD) ? STATE_READ : STATE_WRITE; meson_i2c_prepare_xfer(i2c); - meson_i2c_write_tokens(i2c); reinit_completion(&i2c->done); /* Start the transfer */