From patchwork Thu Mar 9 07:01:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 736852 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 3vf1mS55mVz9sNK for ; Thu, 9 Mar 2017 18:12:08 +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="hWhKgY1W"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751869AbdCIHLw (ORCPT ); Thu, 9 Mar 2017 02:11:52 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35624 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751355AbdCIHLu (ORCPT ); Thu, 9 Mar 2017 02:11:50 -0500 Received: by mail-wm0-f66.google.com with SMTP id z63so9414467wmg.2 for ; Wed, 08 Mar 2017 23:11:49 -0800 (PST) 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=7FqgfLPdldN1Za755JdtL/cQo5kKCgb+WpK0FjiZhdo=; b=hWhKgY1WktAQpGSYoDWqhclg9PTJEtldgxF79A+uxJedUiE4xaGPPZb7g1e2WwDal8 +2Q7hC9Ap5aGxs/bbZSXxn6E1Jg3rDcPBP2VmF+qVHzJppfKXn9MJxyxYulZ7Tl9K/v/ JJXm0sMHNYVD75YtqvhRcEwN5quPla0XG1Ya5NCW+aNw0BhQ2lqj98vZS5IvLcoB8jRj 28Wp/rNGow5JNLFKx9B6B6z06kiGGjbjyiM1Xg2Oo77rE53eZtiyeH+VoiOjjbXQDOlr 1oxHe37Dt6mk/EaGMjsrTOwpBOKkcti3QICNWKHbs8Y8pkrHos1mqS+K2jNkVrOWk3Aa Gcmg== 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=7FqgfLPdldN1Za755JdtL/cQo5kKCgb+WpK0FjiZhdo=; b=AJE/KlzSFi+HvBZBP8BzrGF78pEeAr3ya6WI/ZwiaGtEtn//klD2UB+CQhDLzoCy6C MUEXnu0A/u188gfm0ZgxKQuwbg+1iMijRJ/R4l6mIMtGhTmGRkueNJRPwtu/DEOuXYbf yzGLPFQYTK9uaL9gAc2RpfMH3hhFCSCV3E/Syf5SHRn7ausz01FkkQfG2thntARm7uFq K7PFoGGDNvEDL2CMpODKxBaU3P8I6CsPrZ3fdo1Iuhzsdx8+WQtGAbiI73fss3clN9MK b/rQ9DARP7o47hMuZmZxGwn3Xxg/1lOHp8uLMu7hYl6X24xvrtgU+n3zmyywMJ9d4mNw S4/w== X-Gm-Message-State: AMke39mwRWb7i3f4XanxPspwbjA2iyjaHRVNUUwR2WvmzprllE2oWR/lZgRz7yAEc8KP3A== X-Received: by 10.28.197.133 with SMTP id v127mr11245110wmf.120.1489042911532; Wed, 08 Mar 2017 23:01:51 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:b589:624b:5134:aa75? (p200300C6EBDC4000B589624B5134AA75.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:b589:624b:5134:aa75]) by smtp.googlemail.com with ESMTPSA id s17sm7069782wrc.25.2017.03.08.23.01.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 23:01:51 -0800 (PST) Subject: [PATCH v2 10/10] i2c: meson: improve and simplify interrupt handler To: Wolfram Sang , Jerome Brunet References: Cc: "linux-i2c@vger.kernel.org" , linux-amlogic@lists.infradead.org From: Heiner Kallweit Message-ID: <5b848849-d27e-285f-e97f-31b32eeda8da@gmail.com> Date: Thu, 9 Mar 2017 08:01:11 +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: 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 --- 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 8f4658de..25415690 100644 --- a/drivers/i2c/busses/i2c-meson.c +++ b/drivers/i2c/busses/i2c-meson.c @@ -239,41 +239,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;