diff options
Diffstat (limited to 'arch/arm/mach-davinci/cp_intc.c')
| -rw-r--r-- | arch/arm/mach-davinci/cp_intc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c index 6ab56af3be6b..25221dfe8a20 100644 --- a/arch/arm/mach-davinci/cp_intc.c +++ b/arch/arm/mach-davinci/cp_intc.c @@ -77,12 +77,12 @@ static void davinci_cp_intc_unmask_irq(struct irq_data *d) static int davinci_cp_intc_set_irq_type(struct irq_data *d, unsigned int flow_type) { - unsigned reg = BIT_WORD(d->hwirq); - unsigned mask = BIT_MASK(d->hwirq); - unsigned polarity = davinci_cp_intc_read( - DAVINCI_CP_INTC_SYS_POLARITY(reg)); - unsigned type = davinci_cp_intc_read( - DAVINCI_CP_INTC_SYS_TYPE(reg)); + unsigned int reg, mask, polarity, type; + + reg = BIT_WORD(d->hwirq); + mask = BIT_MASK(d->hwirq); + polarity = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_POLARITY(reg)); + type = davinci_cp_intc_read(DAVINCI_CP_INTC_SYS_TYPE(reg)); switch (flow_type) { case IRQ_TYPE_EDGE_RISING: @@ -150,6 +150,7 @@ static int davinci_cp_intc_host_map(struct irq_domain *h, unsigned int virq, irq_set_chip(virq, &davinci_cp_intc_irq_chip); irq_set_probe(virq); irq_set_handler(virq, handle_edge_irq); + return 0; } |