summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorYi Li <yi.li@analog.com>2009-12-30 07:12:50 +0000
committerMike Frysinger <vapier@gentoo.org>2010-03-09 00:30:48 -0500
commitcb191718fcca887fb4d5e3de833546ab12b433f9 (patch)
tree8106a0477823441b4174b60c6203a853c5613e31 /arch
parent54536c5c6a807d0db7252c3b33638b88f34650ff (diff)
downloadop-kernel-dev-cb191718fcca887fb4d5e3de833546ab12b433f9.zip
op-kernel-dev-cb191718fcca887fb4d5e3de833546ab12b433f9.tar.gz
Blackfin: try to simplify interrupt ifdef ugliness
Signed-off-by: Yi Li <yi.li@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mach-common/ints-priority.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index efbdb6a..3589fe8 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -1062,7 +1062,6 @@ int __init init_arch_irq(void)
#elif defined(CONFIG_BF538) || defined(CONFIG_BF539)
case IRQ_PORTF_INTA:
#endif
-
set_irq_chained_handler(irq,
bfin_demux_gpio_irq);
break;
@@ -1073,24 +1072,30 @@ int __init init_arch_irq(void)
#endif
#ifdef CONFIG_SMP
-#ifdef CONFIG_TICKSOURCE_CORETMR
- case IRQ_CORETMR:
-#endif
case IRQ_SUPPLE_0:
case IRQ_SUPPLE_1:
set_irq_handler(irq, handle_percpu_irq);
break;
#endif
-#ifdef CONFIG_IPIPE
-#ifndef CONFIG_TICKSOURCE_CORETMR
- case IRQ_TIMER0:
+#ifdef CONFIG_TICKSOURCE_CORETMR
+ case IRQ_CORETMR:
+# ifdef CONFIG_SMP
+ set_irq_handler(irq, handle_percpu_irq);
+ break;
+# else
set_irq_handler(irq, handle_simple_irq);
break;
+# endif
#endif
- case IRQ_CORETMR:
+
+#ifdef CONFIG_TICKSOURCE_GPTMR0
+ case IRQ_TIMER0:
set_irq_handler(irq, handle_simple_irq);
break;
+#endif
+
+#ifdef CONFIG_IPIPE
default:
set_irq_handler(irq, handle_level_irq);
break;
OpenPOWER on IntegriCloud