From patchwork Sat Mar 25 13:14:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 743481 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 3vr13X1gBkz9s7j for ; Sun, 26 Mar 2017 00:14:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VCfTYDm6"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750718AbdCYNOr (ORCPT ); Sat, 25 Mar 2017 09:14:47 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35719 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbdCYNOr (ORCPT ); Sat, 25 Mar 2017 09:14:47 -0400 Received: by mail-wm0-f66.google.com with SMTP id z133so2852851wmb.2 for ; Sat, 25 Mar 2017 06:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=VhO8l1U8nuf4fah/bF7gZwVB2OQ7gVqSgnZvlYzfGRk=; b=VCfTYDm6kecV44yjMNcegxMEzQTCq7NaZ4ny2/crXjpBSJYYXVnGrF4iHCHTgqRV08 QZBHqDxu3kIRezdyXVIILX2e62YGywkDoOtZygOzzAwIR7UoiPeMvnvI7U4ROZwp1u9Q TP1v4lTTdZklQWKk+R2iscJyM/Aaxpit4M6Uebl1/7OZ75Ya+uZVggws2CaciC+HAM6n skA23ISolTYHOCRv4N/hLl8EXp3g+EqrrSTyJ3CImP9ie3HI2I1+n2uGWlrP/xRC/DdN fSQIOfLkuUqLKkvn6ZteIH7/BLJNLHdzWUv1g4xZs0yUgTEk+PL1qfkZ+PMONRdB248n 5pZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:cc:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=VhO8l1U8nuf4fah/bF7gZwVB2OQ7gVqSgnZvlYzfGRk=; b=PeAccgAMoHU5MqiCOlrfcyGeLYyG2/3wnQeC/iMNF+9p9/fASWbn0UVMAlcKghiUTQ uFBN0Z0iC5GFCGnOBCJKaSYxizHDy7hLpp74yTEpO9zHqLOtxGqWfhgYQG5f9m46Hb1w nJcouNrKE5Z7rbgrOSKJeGNLf21HjTAfOKS0wQ7A2G8wGMCYvMV1aLmuMh5g2jwLE0TY i8IbapHcIW7LPqPAQkHkIzoKVEOZHAy4AirBaGf4gGWBfbgRhiVF1lM/+f/qJS7RZcWf ZB+NgEVQLR59uqxjswy4V1B4SptngEKF2dJzgKg9its0UfjV5RjTuzCMX1d7zuKKB3VU NgGw== X-Gm-Message-State: AFeK/H0AtXTCW0Y+K8mlNmrJ5rEP3NN7cUttdSz3FJYzWwMi1RipCdYh9LT9qrhwK7Wz4g== X-Received: by 10.28.194.7 with SMTP id s7mr2022843wmf.34.1490447685072; Sat, 25 Mar 2017 06:14:45 -0700 (PDT) Received: from ?IPv6:2003:c6:ebdc:4000:b429:3993:904f:3ba7? (p200300C6EBDC4000B4293993904F3BA7.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:b429:3993:904f:3ba7]) by smtp.googlemail.com with ESMTPSA id m186sm6468859wmd.21.2017.03.25.06.14.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Mar 2017 06:14:44 -0700 (PDT) Subject: [PATCH v5 10/10] i2c: meson: improve and simplify interrupt handler To: Wolfram Sang , Jerome Brunet , Kevin Hilman References: <645519b8-93e6-57b1-ae8f-7804c6beb9b1@gmail.com> Cc: "linux-i2c@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: <5ffdcebd-1dc7-8263-acf6-38ea02e50b16@gmail.com> Date: Sat, 25 Mar 2017 14:14:08 +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: <645519b8-93e6-57b1-ae8f-7804c6beb9b1@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The preceding changes in this patch series now allow to simplify the interrupt handler significantly. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - no changes v4: - no changes v5: - no changes --- drivers/i2c/busses/i2c-meson.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c index d3c33ee4..bccebd28 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -242,41 +242,21 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) goto out; } - switch (i2c->state) { - case STATE_READ: - if (i2c->count > 0) { - meson_i2c_get_data(i2c, i2c->msg->buf + i2c->pos, - i2c->count); - i2c->pos += i2c->count; - } - - if (i2c->pos >= i2c->msg->len) { - i2c->state = STATE_IDLE; - complete(&i2c->done); - break; - } - - meson_i2c_prepare_xfer(i2c); - break; - case STATE_WRITE: - i2c->pos += i2c->count; + if (i2c->state == STATE_READ && i2c->count) + meson_i2c_get_data(i2c, i2c->msg->buf + i2c->pos, i2c->count); - if (i2c->pos >= i2c->msg->len) { - i2c->state = STATE_IDLE; - complete(&i2c->done); - break; - } + i2c->pos += i2c->count; - meson_i2c_prepare_xfer(i2c); - break; + if (i2c->pos >= i2c->msg->len) { + i2c->state = STATE_IDLE; + complete(&i2c->done); + goto out; } + /* Restart the processing */ + meson_i2c_prepare_xfer(i2c); + meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, REG_CTRL_START); out: - if (i2c->state != STATE_IDLE) - /* Restart the processing */ - meson_i2c_set_mask(i2c, REG_CTRL, REG_CTRL_START, - REG_CTRL_START); - spin_unlock(&i2c->lock); return IRQ_HANDLED;