Title: [5883] trunk/arch/blackfin/mach-common/ints-priority.c: cleanup IPIPE logic for bfin_set_irq_handler()
- Revision
- 5883
- Author
- vapier
- Date
- 2008-12-18 11:50:15 -0600 (Thu, 18 Dec 2008)
Log Message
cleanup IPIPE logic for bfin_set_irq_handler()
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-common/ints-priority.c (5882 => 5883)
--- trunk/arch/blackfin/mach-common/ints-priority.c 2008-12-18 17:38:34 UTC (rev 5882)
+++ trunk/arch/blackfin/mach-common/ints-priority.c 2008-12-18 17:50:15 UTC (rev 5883)
@@ -389,10 +389,14 @@
static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)
{
+#ifdef CONFIG_IPIPE
+ _set_irq_handler(irq, handle_edge_irq);
+#else
struct irq_desc *desc = irq_desc + irq;
/* May not call generic set_irq_handler() due to spinlock
recursion. */
desc->handle_irq = handle;
+#endif
}
static DECLARE_BITMAP(gpio_enabled, MAX_BLACKFIN_GPIOS);
@@ -504,17 +508,9 @@
}
if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING))
-#ifdef CONFIG_IPIPE
- _set_irq_handler(irq, handle_edge_irq);
-#else
bfin_set_irq_handler(irq, handle_edge_irq);
-#endif
else
-#ifdef CONFIG_IPIPE
- _set_irq_handler(irq, handle_level_irq);
-#else
bfin_set_irq_handler(irq, handle_level_irq);
-#endif
return 0;
}
@@ -812,18 +808,10 @@
if (type & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)) {
pint[bank]->edge_set = pintbit;
-#ifdef CONFIG_IPIPE
- _set_irq_handler(irq, handle_edge_irq);
-#else
bfin_set_irq_handler(irq, handle_edge_irq);
-#endif
} else {
pint[bank]->edge_clear = pintbit;
-#ifdef CONFIG_IPIPE
- _set_irq_handler(irq, handle_level_irq);
-#else
bfin_set_irq_handler(irq, handle_level_irq);
-#endif
}
return 0;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
