提交 7f5db6a8 编写于 作者: L Lennert Buytenhek 提交者: Linus Torvalds

gpio: timbgpio: Fix up irq_data conversion breakage.

Commit a1f5f22a ("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: NLennert Buytenhek <buytenh@secretlab.ca>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Richard Röjfors <richard.rojfors@mocean-labs.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 c72a04e3
......@@ -193,13 +193,13 @@ static int timbgpio_irq_type(struct irq_data *d, unsigned trigger)
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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册