@@ -26,6 +26,7 @@
#include "soc.h"
#include "iomap.h"
#include "common.h"
+#include "../../drivers/irqchip/irqchip.h"
/* selected INTC register offsets */
@@ -322,14 +323,11 @@ static int __init intc_of_init(struct device_node *node,
return 0;
}
-static struct of_device_id irq_match[] __initdata = {
- { .compatible = "ti,omap2-intc", .data = intc_of_init, },
- { }
-};
+IRQCHIP_DECLARE(omap_intc, "ti,omap2-intc", intc_of_init);
void __init omap_intc_of_init(void)
{
- of_irq_init(irq_match);
+ of_irq_init(&irqchip_of_match_omap_intc);
}
asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs)
IRQCHIP_DECLARE macro is used to declare the same of_device_id structure for irqchips, it's just a helper. No functional changes. Note that we're temporarily including irqchip.h with its full path, until we move this driver to drivers/irqchip/. Signed-off-by: Felipe Balbi <balbi@ti.com> --- arch/arm/mach-omap2/irq.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)