diff options
author | Roland Stigge <stigge@antcom.de> | 2012-11-07 07:30:50 -0500 |
---|---|---|
committer | Roland Stigge <stigge@antcom.de> | 2012-11-07 07:30:50 -0500 |
commit | 2998b1d3b1ee31e1c21085383226be1b0c496eab (patch) | |
tree | 0c31b1cfe627281e6b6c92858c8c7212d6938653 /arch/arm/mach-lpc32xx | |
parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) |
ARM: LPC32xx: Remove superfluous irq_alloc_descs()
This patch removes the call to irq_alloc_descs() which always returns an error
since the descriptors are always preallocated already.
Signed-off-by: Roland Stigge <stigge@antcom.de>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
-rw-r--r-- | arch/arm/mach-lpc32xx/irq.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-lpc32xx/irq.c b/arch/arm/mach-lpc32xx/irq.c index 3c6332753358..54c68b12bae0 100644 --- a/arch/arm/mach-lpc32xx/irq.c +++ b/arch/arm/mach-lpc32xx/irq.c | |||
@@ -412,7 +412,6 @@ static const struct of_device_id mic_of_match[] __initconst = { | |||
412 | void __init lpc32xx_init_irq(void) | 412 | void __init lpc32xx_init_irq(void) |
413 | { | 413 | { |
414 | unsigned int i; | 414 | unsigned int i; |
415 | int irq_base; | ||
416 | 415 | ||
417 | /* Setup MIC */ | 416 | /* Setup MIC */ |
418 | __raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_MIC_BASE)); | 417 | __raw_writel(0, LPC32XX_INTC_MASK(LPC32XX_MIC_BASE)); |
@@ -475,15 +474,8 @@ void __init lpc32xx_init_irq(void) | |||
475 | 474 | ||
476 | of_irq_init(mic_of_match); | 475 | of_irq_init(mic_of_match); |
477 | 476 | ||
478 | irq_base = irq_alloc_descs(-1, 0, NR_IRQS, 0); | ||
479 | if (irq_base < 0) { | ||
480 | pr_warn("Cannot allocate irq_descs, assuming pre-allocated\n"); | ||
481 | irq_base = 0; | ||
482 | } | ||
483 | |||
484 | lpc32xx_mic_domain = irq_domain_add_legacy(lpc32xx_mic_np, NR_IRQS, | 477 | lpc32xx_mic_domain = irq_domain_add_legacy(lpc32xx_mic_np, NR_IRQS, |
485 | irq_base, 0, | 478 | 0, 0, &irq_domain_simple_ops, |
486 | &irq_domain_simple_ops, | ||
487 | NULL); | 479 | NULL); |
488 | if (!lpc32xx_mic_domain) | 480 | if (!lpc32xx_mic_domain) |
489 | panic("Unable to add MIC irq domain\n"); | 481 | panic("Unable to add MIC irq domain\n"); |