linux-mips
[Top] [All Lists]

[PATCH] MIPS: JZ4740: GPIO: Use new name for generic ack function.

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] MIPS: JZ4740: GPIO: Use new name for generic ack function.
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 14 Sep 2011 00:28:30 +0200
Cc: linux-mips@linux-mips.org, Maarten ter Huurne <maarten@treewalker.org>, Lars-Peter Clausen <lars@metafoo.de>
Sender: linux-mips-bounce@linux-mips.org
From: Maarten ter Huurne <maarten@treewalker.org>

In commit 659fb32d1b6("genirq: replace irq_gc_ack() with {set,clr}_bit variants
(fwd)"), irq_gc_ack was renamed to irq_gc_ack_set_bit.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
Ralf, it would be good if you could merge this into "MIPS: JZ4740: Use generic
irq chip" which should be in your 3.2 queue.

Thanks
- Lars
---
 arch/mips/jz4740/gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
index 7179c78..e1ddb95 100644
--- a/arch/mips/jz4740/gpio.c
+++ b/arch/mips/jz4740/gpio.c
@@ -441,7 +441,7 @@ static void jz4740_gpio_chip_init(struct jz_gpio_chip 
*chip, unsigned int id)
        ct->chip.name = "GPIO";
        ct->chip.irq_mask = irq_gc_mask_disable_reg;
        ct->chip.irq_unmask = jz_gpio_irq_unmask;
-       ct->chip.irq_ack = irq_gc_ack;
+       ct->chip.irq_ack = irq_gc_ack_set_bit;
        ct->chip.irq_suspend = jz4740_irq_suspend;
        ct->chip.irq_resume = jz4740_irq_resume;
        ct->chip.irq_startup = jz_gpio_irq_startup;
-- 
1.7.2.5


<Prev in Thread] Current Thread [Next in Thread>