Skip to content

Commit

Permalink
gpio: timbgpio: Fix up irq_data conversion breakage.
Browse files Browse the repository at this point in the history
Commit a1f5f22 ("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>
  • Loading branch information
Lennert Buytenhek authored and Linus Torvalds committed Jan 14, 2011
1 parent c72a04e commit 7f5db6a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpio/timbgpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 7f5db6a

Please sign in to comment.