Skip to content

Commit 87c10dd

Browse files
committed
gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.
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>
1 parent 46b1744 commit 87c10dd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpio/gpio-aspeed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ static int aspeed_gpio_set_type(struct irq_data *d, unsigned int type)
302302

303303
static void aspeed_gpio_irq_handler(struct irq_desc *desc)
304304
{
305+
struct aspeed_gpio *gpio = irq_desc_get_handler_data(desc);
305306
struct irq_chip *chip = irq_desc_get_chip(desc);
306-
struct aspeed_gpio *gpio = irq_desc_get_chip_data(desc);
307307
unsigned int i, p, girq;
308308
unsigned long reg;
309309

0 commit comments

Comments
 (0)