diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2011-01-13 01:42:24 +0300 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-01-15 13:29:15 +0300 |
| commit | a1015a159530391fc498482656bab6c99dcd3c70 (patch) | |
| tree | 96e55285174663c7486b8b1c92fe241b7d03878a /arch/arm/mach-pxa/irq.c | |
| parent | 1b624fb64c2de44c00576cc9695680983f05c1ce (diff) | |
| download | linux-a1015a159530391fc498482656bab6c99dcd3c70.tar.xz | |
ARM: pxa: fix recursive calls in pxa_low_gpio_chip
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Tested-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/irq.c')
| -rw-r--r-- | arch/arm/mach-pxa/irq.c | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c index b71677bce548..2693e3c3776f 100644 --- a/arch/arm/mach-pxa/irq.c +++ b/arch/arm/mach-pxa/irq.c @@ -53,6 +53,17 @@ static inline int cpu_has_ipr(void) return !cpu_is_pxa25x(); } +static inline void __iomem *irq_base(int i) +{ + static unsigned long phys_base[] = { + 0x40d00000, + 0x40d0009c, + 0x40d00130, + }; + + return (void __iomem *)io_p2v(phys_base[i]); +} + static void pxa_mask_irq(struct irq_data *d) { void __iomem *base = irq_data_get_irq_chip_data(d); @@ -108,25 +119,11 @@ static void pxa_ack_low_gpio(struct irq_data *d) GEDR0 = (1 << (d->irq - IRQ_GPIO0)); } -static void pxa_mask_low_gpio(struct irq_data *d) -{ - struct irq_desc *desc = irq_to_desc(d->irq); - - desc->irq_data.chip->irq_mask(d); -} - -static void pxa_unmask_low_gpio(struct irq_data *d) -{ - struct irq_desc *desc = irq_to_desc(d->irq); - - desc->irq_data.chip->irq_unmask(d); -} - static struct irq_chip pxa_low_gpio_chip = { .name = "GPIO-l", .irq_ack = pxa_ack_low_gpio, - .irq_mask = pxa_mask_low_gpio, - .irq_unmask = pxa_unmask_low_gpio, + .irq_mask = pxa_mask_irq, + .irq_unmask = pxa_unmask_irq, .irq_set_type = pxa_set_low_gpio_type, }; @@ -141,6 +138,7 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn) for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) { set_irq_chip(irq, &pxa_low_gpio_chip); + set_irq_chip_data(irq, irq_base(0)); set_irq_handler(irq, handle_edge_irq); set_irq_flags(irq, IRQF_VALID); } @@ -148,17 +146,6 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn) pxa_low_gpio_chip.irq_set_wake = fn; } -static inline void __iomem *irq_base(int i) -{ - static unsigned long phys_base[] = { - 0x40d00000, - 0x40d0009c, - 0x40d00130, - }; - - return (void __iomem *)io_p2v(phys_base[i]); -} - void __init pxa_init_irq(int irq_nr, set_wake_t fn) { int irq, i, n; |