diff options
| author | Jeremy Kerr <jk@ozlabs.org> | 2015-12-01 05:14:24 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2015-12-01 07:12:39 +0300 |
| commit | 6041e18256bd64692c576f7393073c2d14e778eb (patch) | |
| tree | 28f414e89338d3495363d77066b19ebe334f4afe | |
| parent | 46b1744143e29af4925d612f14e214882c1e0049 (diff) | |
| download | linux-6041e18256bd64692c576f7393073c2d14e778eb.tar.xz | |
gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.openbmc-20151202-1
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>
| -rw-r--r-- | drivers/gpio/gpio-aspeed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index 87e159a75e8f..152b7d4484d1 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -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; |