[PATCH linux v2 2/3] gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.

OpenBMC Patches openbmc-patches at stwcx.xyz
Mon Dec 7 02:40:25 AEDT 2015


From: Jeremy Kerr <jk at ozlabs.org>

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 at ozlabs.org>
---
 drivers/gpio/gpio-aspeed.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
index 87e159a..152b7d4 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;
 
-- 
2.6.3




More information about the openbmc mailing list