From patchwork Mon Dec 9 16:21:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 3312121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3C9F89F1F0 for ; Mon, 9 Dec 2013 16:52:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0C6D3202E9 for ; Mon, 9 Dec 2013 16:52:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8935D202B8 for ; Mon, 9 Dec 2013 16:52:25 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vq3dV-0000pr-9m; Mon, 09 Dec 2013 16:24:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vq3cn-0001jc-Bj; Mon, 09 Dec 2013 16:24:01 +0000 Received: from bear.ext.ti.com ([192.94.94.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vq3bR-0001YT-5H for linux-arm-kernel@lists.infradead.org; Mon, 09 Dec 2013 16:22:46 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id rB9GM6Ot026339; Mon, 9 Dec 2013 10:22:06 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id rB9GM659023112; Mon, 9 Dec 2013 10:22:06 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Mon, 9 Dec 2013 10:22:06 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id rB9GM64E006871; Mon, 9 Dec 2013 10:22:06 -0600 From: Felipe Balbi To: Subject: [PATCH v3 06/15] mfd: menelaus: Pass menelaus pointer as argument to enable/disable irq Date: Mon, 9 Dec 2013 10:21:16 -0600 Message-ID: <1386606085-26838-6-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.8.4.GIT In-Reply-To: <1386606085-26838-1-git-send-email-balbi@ti.com> References: <20131209161422.GC24047@saruman.home> <1386606085-26838-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131209_112237_614048_C82E13AF X-CRM114-Status: GOOD ( 10.88 ) X-Spam-Score: -6.9 (------) Cc: Aaro Koskinen , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Linux OMAP Mailing List , Linux ARM Kernel Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 We want to, eventually, get rid of the global the_menelaus pointer, so let's start passing menelaus as argument to some function calls and slowly phase out the_menelaus global pointer. Tested-by: Aaro Koskinen Signed-off-by: Felipe Balbi --- drivers/mfd/menelaus.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 9ccbb79..4c51e4b 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -199,35 +199,35 @@ static int menelaus_read_reg(int reg) return val; } -static int menelaus_enable_irq(int irq) +static int menelaus_enable_irq(struct menelaus_chip *m, int irq) { if (irq > 7) { irq -= 8; - the_menelaus->mask2 &= ~(1 << irq); + m->mask2 &= ~(1 << irq); return menelaus_write_reg(MENELAUS_INT_MASK2, - the_menelaus->mask2); + m->mask2); } else { - the_menelaus->mask1 &= ~(1 << irq); + m->mask1 &= ~(1 << irq); return menelaus_write_reg(MENELAUS_INT_MASK1, - the_menelaus->mask1); + m->mask1); } } -static int menelaus_disable_irq(int irq) +static int menelaus_disable_irq(struct menelaus_chip *m, int irq) { if (irq > 7) { irq -= 8; - the_menelaus->mask2 |= (1 << irq); + m->mask2 |= (1 << irq); return menelaus_write_reg(MENELAUS_INT_MASK2, - the_menelaus->mask2); + m->mask2); } else { - the_menelaus->mask1 |= (1 << irq); + m->mask1 |= (1 << irq); return menelaus_write_reg(MENELAUS_INT_MASK1, - the_menelaus->mask1); + m->mask1); } } -static int menelaus_ack_irq(int irq) +static int menelaus_ack_irq(struct menelaus_chip *m, int irq) { if (irq > 7) return menelaus_write_reg(MENELAUS_INT_ACK2, 1 << (irq - 8)); @@ -243,7 +243,7 @@ static int menelaus_add_irq_work(int irq, mutex_lock(&the_menelaus->lock); the_menelaus->handlers[irq] = handler; - ret = menelaus_enable_irq(irq); + ret = menelaus_enable_irq(the_menelaus, irq); mutex_unlock(&the_menelaus->lock); return ret; @@ -255,7 +255,7 @@ static int menelaus_remove_irq_work(int irq) int ret = 0; mutex_lock(&the_menelaus->lock); - ret = menelaus_disable_irq(irq); + ret = menelaus_disable_irq(the_menelaus, irq); the_menelaus->handlers[irq] = NULL; mutex_unlock(&the_menelaus->lock); @@ -793,25 +793,25 @@ out: static irqreturn_t menelaus_irq(int irq, void *_menelaus) { - struct menelaus_chip *menelaus = _menelaus; - void (*handler)(struct menelaus_chip *menelaus); + struct menelaus_chip *m = _menelaus; + void (*handler)(struct menelaus_chip *m); unsigned long isr; unsigned long i; isr = (menelaus_read_reg(MENELAUS_INT_STATUS2) - & ~menelaus->mask2) << 8; + & ~m->mask2) << 8; isr |= menelaus_read_reg(MENELAUS_INT_STATUS1) - & ~menelaus->mask1; + & ~m->mask1; for_each_set_bit(i, &isr, 16) { - mutex_lock(&menelaus->lock); - menelaus_disable_irq(i); - menelaus_ack_irq(i); - handler = menelaus->handlers[i]; + mutex_lock(&m->lock); + menelaus_disable_irq(m, i); + menelaus_ack_irq(m, i); + handler = m->handlers[i]; if (handler) - handler(menelaus); - menelaus_enable_irq(i); - mutex_unlock(&menelaus->lock); + handler(m); + menelaus_enable_irq(m, i); + mutex_unlock(&m->lock); } return IRQ_HANDLED;