diff options
author | Yi Li <yi.li@analog.com> | 2009-12-30 02:12:50 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-03-09 00:30:48 -0500 |
commit | cb191718fcca887fb4d5e3de833546ab12b433f9 (patch) | |
tree | 8106a0477823441b4174b60c6203a853c5613e31 /arch/blackfin/mach-common/ints-priority.c | |
parent | 54536c5c6a807d0db7252c3b33638b88f34650ff (diff) |
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/blackfin/mach-common/ints-priority.c')
-rw-r--r-- | arch/blackfin/mach-common/ints-priority.c | 21 |
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 efbdb6a19418..3589fe8b86ba 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) | |||
1062 | #elif defined(CONFIG_BF538) || defined(CONFIG_BF539) | 1062 | #elif defined(CONFIG_BF538) || defined(CONFIG_BF539) |
1063 | case IRQ_PORTF_INTA: | 1063 | case IRQ_PORTF_INTA: |
1064 | #endif | 1064 | #endif |
1065 | |||
1066 | set_irq_chained_handler(irq, | 1065 | set_irq_chained_handler(irq, |
1067 | bfin_demux_gpio_irq); | 1066 | bfin_demux_gpio_irq); |
1068 | break; | 1067 | break; |
@@ -1073,24 +1072,30 @@ int __init init_arch_irq(void) | |||
1073 | #endif | 1072 | #endif |
1074 | 1073 | ||
1075 | #ifdef CONFIG_SMP | 1074 | #ifdef CONFIG_SMP |
1076 | #ifdef CONFIG_TICKSOURCE_CORETMR | ||
1077 | case IRQ_CORETMR: | ||
1078 | #endif | ||
1079 | case IRQ_SUPPLE_0: | 1075 | case IRQ_SUPPLE_0: |
1080 | case IRQ_SUPPLE_1: | 1076 | case IRQ_SUPPLE_1: |
1081 | set_irq_handler(irq, handle_percpu_irq); | 1077 | set_irq_handler(irq, handle_percpu_irq); |
1082 | break; | 1078 | break; |
1083 | #endif | 1079 | #endif |
1084 | 1080 | ||
1085 | #ifdef CONFIG_IPIPE | 1081 | #ifdef CONFIG_TICKSOURCE_CORETMR |
1086 | #ifndef CONFIG_TICKSOURCE_CORETMR | 1082 | case IRQ_CORETMR: |
1087 | case IRQ_TIMER0: | 1083 | # ifdef CONFIG_SMP |
1084 | set_irq_handler(irq, handle_percpu_irq); | ||
1085 | break; | ||
1086 | # else | ||
1088 | set_irq_handler(irq, handle_simple_irq); | 1087 | set_irq_handler(irq, handle_simple_irq); |
1089 | break; | 1088 | break; |
1089 | # endif | ||
1090 | #endif | 1090 | #endif |
1091 | case IRQ_CORETMR: | 1091 | |
1092 | #ifdef CONFIG_TICKSOURCE_GPTMR0 | ||
1093 | case IRQ_TIMER0: | ||
1092 | set_irq_handler(irq, handle_simple_irq); | 1094 | set_irq_handler(irq, handle_simple_irq); |
1093 | break; | 1095 | break; |
1096 | #endif | ||
1097 | |||
1098 | #ifdef CONFIG_IPIPE | ||
1094 | default: | 1099 | default: |
1095 | set_irq_handler(irq, handle_level_irq); | 1100 | set_irq_handler(irq, handle_level_irq); |
1096 | break; | 1101 | break; |