aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-pxa.c
diff options
context:
space:
mode:
authorChao Xie <xiechao.mail@gmail.com>2012-07-31 02:13:09 -0400
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-08-16 04:15:54 -0400
commit0d2ee5d773c209504db643ec4d4b9f3624a6663f (patch)
treea0d0bccd073403b73891cb9283891f558ce0ecb2 /drivers/gpio/gpio-pxa.c
parentcd0a4a9503345c7076978ecc81c38a1c61730bfe (diff)
gpio: pxa: add chain_eneter and chain_exit for irq handler
Signed-off-by: Chao Xie <xiechao.mail@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
-rw-r--r--drivers/gpio/gpio-pxa.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 6d0cb9dff27d..db5c2958f973 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -26,6 +26,8 @@
26#include <linux/syscore_ops.h> 26#include <linux/syscore_ops.h>
27#include <linux/slab.h> 27#include <linux/slab.h>
28 28
29#include <asm/mach/irq.h>
30
29#include <mach/irqs.h> 31#include <mach/irqs.h>
30 32
31/* 33/*
@@ -331,6 +333,9 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
331 struct pxa_gpio_chip *c; 333 struct pxa_gpio_chip *c;
332 int loop, gpio, gpio_base, n; 334 int loop, gpio, gpio_base, n;
333 unsigned long gedr; 335 unsigned long gedr;
336 struct irq_chip *chip = irq_desc_get_chip(desc);
337
338 chained_irq_enter(chip, desc);
334 339
335 do { 340 do {
336 loop = 0; 341 loop = 0;
@@ -350,6 +355,8 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
350 } 355 }
351 } 356 }
352 } while (loop); 357 } while (loop);
358
359 chained_irq_exit(chip, desc);
353} 360}
354 361
355static void pxa_ack_muxed_gpio(struct irq_data *d) 362static void pxa_ack_muxed_gpio(struct irq_data *d)