Skip to content

Commit

Permalink
arm: omap: irq: drop omap2_intc_handle_irq()
Browse files Browse the repository at this point in the history
that was just a no-op wrapper around omap_intc_handle_irq
anyway.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Felipe Balbi authored and Tony Lindgren committed Sep 11, 2014
1 parent 05f1e73 commit 2aced89
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-omap2/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ void omap_intc_restore_context(void);
void omap3_intc_suspend(void);
void omap3_intc_prepare_idle(void);
void omap3_intc_resume_idle(void);
void omap2_intc_handle_irq(struct pt_regs *regs);
void omap_gic_of_init(void);

#ifdef CONFIG_CACHE_L2X0
Expand Down
16 changes: 6 additions & 10 deletions arch/arm/mach-omap2/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ static void __init omap_init_irq(u32 base, int nr_irqs,
omap_alloc_gc(omap_irq_base + j, j + irq_base, 32);
}

static inline void omap_intc_handle_irq(struct pt_regs *regs)
static asmlinkage void __exception_irq_entry
omap_intc_handle_irq(struct pt_regs *regs)
{
u32 irqnr;
int handled_irq = 0;
Expand Down Expand Up @@ -276,27 +277,22 @@ static inline void omap_intc_handle_irq(struct pt_regs *regs)
omap_ack_irq(NULL);
}

asmlinkage void __exception_irq_entry omap2_intc_handle_irq(struct pt_regs *regs)
{
omap_intc_handle_irq(regs);
}

void __init omap2_init_irq(void)
{
omap_init_irq(OMAP24XX_IC_BASE, 96, NULL);
set_handle_irq(omap2_intc_handle_irq);
set_handle_irq(omap_intc_handle_irq);
}

void __init omap3_init_irq(void)
{
omap_init_irq(OMAP34XX_IC_BASE, 96, NULL);
set_handle_irq(omap2_intc_handle_irq);
set_handle_irq(omap_intc_handle_irq);
}

void __init ti81xx_init_irq(void)
{
omap_init_irq(OMAP34XX_IC_BASE, 128, NULL);
set_handle_irq(omap2_intc_handle_irq);
set_handle_irq(omap_intc_handle_irq);
}

static int __init intc_of_init(struct device_node *node,
Expand All @@ -318,7 +314,7 @@ static int __init intc_of_init(struct device_node *node,

omap_init_irq(res.start, nr_irq, of_node_get(node));

set_handle_irq(omap2_intc_handle_irq);
set_handle_irq(omap_intc_handle_irq);

return 0;
}
Expand Down

0 comments on commit 2aced89

Please sign in to comment.