From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752194Ab3LQAJt (ORCPT ); Mon, 16 Dec 2013 19:09:49 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:52256 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751992Ab3LQAJm (ORCPT ); Mon, 16 Dec 2013 19:09:42 -0500 From: Felipe Balbi To: CC: Tony Lindgren , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , Linux Kernel Mailing List , Aaro Koskinen , Felipe Balbi Subject: [PATCH 05/10] mfd: menelaus: Use for_each_set_bit() Date: Mon, 16 Dec 2013 18:08:19 -0600 Message-ID: <1387238904-7843-5-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.8.4.GIT In-Reply-To: <1387238904-7843-1-git-send-email-balbi@ti.com> References: <20131216153936.GQ18769@lee--X1> <1387238904-7843-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org That macro just helps removing some extra line of code and hides ffs() calls. While at that, also fix a variable shadowing bug where 'int irq' was being redeclared inside inner loop while it was also argument to interrupt handler. Tested-by: Aaro Koskinen Signed-off-by: Felipe Balbi --- drivers/mfd/menelaus.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 87d80a8..d3e3022 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -795,24 +795,22 @@ static irqreturn_t menelaus_irq(int irq, void *_menelaus) { struct menelaus_chip *menelaus = _menelaus; void (*handler)(struct menelaus_chip *menelaus); - unsigned isr; + unsigned long isr; + unsigned long i; isr = (menelaus_read_reg(MENELAUS_INT_STATUS2) & ~menelaus->mask2) << 8; isr |= menelaus_read_reg(MENELAUS_INT_STATUS1) & ~menelaus->mask1; - while (isr) { - int irq = fls(isr) - 1; - isr &= ~(1 << irq); - + for_each_set_bit(i, &isr, 16) { mutex_lock(&menelaus->lock); - menelaus_disable_irq(irq); - menelaus_ack_irq(irq); - handler = menelaus->handlers[irq]; + menelaus_disable_irq(i); + menelaus_ack_irq(i); + handler = menelaus->handlers[i]; if (handler) handler(menelaus); - menelaus_enable_irq(irq); + menelaus_enable_irq(i); mutex_unlock(&menelaus->lock); } -- 1.8.4.GIT