summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner2015-07-13 01:52:00 +0200
committerLinus Walleij2015-07-17 21:56:21 +0200
commit415f748c8658033d37af520dfa321a9413b7d665 (patch)
tree94033877133e51f360076490f2a01223010c6f22
parentpinctrl/pistachio: Prepare pistachio_gpio_irq_handler for irq argument removal (diff)
downloadkernel-qcow2-linux-415f748c8658033d37af520dfa321a9413b7d665.tar.gz
kernel-qcow2-linux-415f748c8658033d37af520dfa321a9413b7d665.tar.xz
kernel-qcow2-linux-415f748c8658033d37af520dfa321a9413b7d665.zip
pinctrl/rockchip: Prepare rockchip_irq_demux for irq argument removal
The irq argument of most interrupt flow handlers is unused or merily used instead of a local variable. The handlers which need the irq argument can retrieve the irq number from the irq descriptor. Search and update was done with coccinelle and the invaluable help of Julia Lawall. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Jiang Liu <jiang.liu@linux.intel.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: linux-gpio@vger.kernel.org
-rw-r--r--drivers/pinctrl/pinctrl-rockchip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
index 28f9d08faf27..cc2843a1f38c 100644
--- a/drivers/pinctrl/pinctrl-rockchip.c
+++ b/drivers/pinctrl/pinctrl-rockchip.c
@@ -1469,7 +1469,7 @@ static const struct gpio_chip rockchip_gpiolib_chip = {
* Interrupt handling
*/
-static void rockchip_irq_demux(unsigned int irq, struct irq_desc *desc)
+static void rockchip_irq_demux(unsigned int __irq, struct irq_desc *desc)
{
struct irq_chip *chip = irq_desc_get_chip(desc);
struct rockchip_pin_bank *bank = irq_desc_get_handler_data(desc);
@@ -1482,7 +1482,7 @@ static void rockchip_irq_demux(unsigned int irq, struct irq_desc *desc)
pend = readl_relaxed(bank->reg_base + GPIO_INT_STATUS);
while (pend) {
- unsigned int virq;
+ unsigned int irq, virq;
irq = __ffs(pend);
pend &= ~BIT(irq);