The patch titled
gpio: timbgpio: Fix up irq_data conversion breakage.
has been added to the -mm tree. Its filename is
gpio-timbgpio-fix-up-irq_data-conversion-breakage.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: gpio: timbgpio: Fix up irq_data conversion breakage.
From: Lennert Buytenhek <buytenh@xxxxxxxxxxxxxx>
a1f5f22adc3 ("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@xxxxxxxxxxxx>
Cc: Richard Röjfors <richard.rojfors@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpio/timbgpio.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/gpio/timbgpio.c~gpio-timbgpio-fix-up-irq_data-conversion-breakage drivers/gpio/timbgpio.c
--- a/drivers/gpio/timbgpio.c~gpio-timbgpio-fix-up-irq_data-conversion-breakage
+++ a/drivers/gpio/timbgpio.c
@@ -193,13 +193,13 @@ out:
return ret;
}
-static void timbgpio_irq(struct irq_data *d, struct irq_desc *desc)
+static void timbgpio_irq(unsigned int irq, struct irq_desc *desc)
{
- struct timbgpio *tgpio = irq_data_get_irq_data(d);
+ struct timbgpio *tgpio = get_irq_data(irq);
unsigned long ipr;
int offset;
- desc->irq_data.chip->ack(irq_get_irq_data(d));
+ desc->irq_data.chip->irq_ack(irq_get_irq_data(irq));
ipr = ioread32(tgpio->membase + TGPIO_IPR);
iowrite32(ipr, tgpio->membase + TGPIO_ICR);
_
Patches currently in -mm which might be from buytenh@xxxxxxxxxxxxxx are
origin.patch
gpio-timbgpio-fix-up-irq_data-conversion-breakage.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
