aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2011-01-14 03:44:19 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 11:13:13 -0500
commit7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b (patch)
tree6cadcaa2b4709e82e70792ddc3afb0fa8b69aed8 /drivers/gpio
parentc72a04e34735ec3f19f4788b7f95017310b5e1eb (diff)
gpio: timbgpio: Fix up irq_data conversion breakage.
Commit a1f5f22adc3206c47e70652c12671666c65b579f ("gpio: timbgpio: irq_data conversion") was slightly too enthusiastic in converting timbgpio_irq() over to take an irq_data * argument instead of an unsigned int irq argument, as it is a flow handler, which still take IRQ numbers for now. (And on top of that, it was using the wrong accessors.) This fixes it up, and seems to build without warnings. Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Richard Röjfors <richard.rojfors@mocean-labs.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/timbgpio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c
index 349131eb1ce0..58c8f30352dd 100644
--- a/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@ -193,13 +193,13 @@ out:
193 return ret; 193 return ret;
194} 194}
195 195
196static void timbgpio_irq(struct irq_data *d, struct irq_desc *desc) 196static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
197{ 197{
198 struct timbgpio *tgpio = irq_data_get_irq_data(d); 198 struct timbgpio *tgpio = get_irq_data(irq);
199 unsigned long ipr; 199 unsigned long ipr;
200 int offset; 200 int offset;
201 201
202 desc->irq_data.chip->ack(irq_get_irq_data(d)); 202 desc->irq_data.chip->irq_ack(irq_get_irq_data(irq));
203 ipr = ioread32(tgpio->membase + TGPIO_IPR); 203 ipr = ioread32(tgpio->membase + TGPIO_IPR);
204 iowrite32(ipr, tgpio->membase + TGPIO_ICR); 204 iowrite32(ipr, tgpio->membase + TGPIO_ICR);
205 205