Skip to content

Commit

Permalink
gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.
Browse files Browse the repository at this point in the history
In the port to 4.3, we converted to the newer irq api, but used the
chip_data for the struct aspeed_gpio pointer, rather than the
handler_data.

We use irq_set_chaned_handler_and_data to establish this pointer, which
sets handler_data. This change uses the appropriate pointer in our
handler instead.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
  • Loading branch information
jk-ozlabs committed Dec 1, 2015
1 parent 46b1744 commit 87c10dd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpio/gpio-aspeed.c
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ static int aspeed_gpio_set_type(struct irq_data *d, unsigned int type)

static void aspeed_gpio_irq_handler(struct irq_desc *desc)
{
struct aspeed_gpio *gpio = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(desc);
struct aspeed_gpio *gpio = irq_desc_get_chip_data(desc);
unsigned int i, p, girq;
unsigned long reg;

Expand Down

0 comments on commit 87c10dd

Please sign in to comment.