ARM: 7236/1: vic: always use simple ops

Now that irq_domain_simple_ops are available for non-DT users, use them
in the VIC driver so that we don't get a NULL dereference in
irq_domain_to_irq() when registering the domain.

Cc: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 77287504c8b40e31e3789d1e27dcc824003b2af6..dcb004a804c7da6d23a4104f10e2c4a7980db986 100644 (file)
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -197,8 +197,8 @@ static void __init vic_register(void __iomem *base, unsigned int irq,
        v->domain.nr_irq = 32;
 #ifdef CONFIG_OF_IRQ
        v->domain.of_node = of_node_get(node);
-       v->domain.ops = &irq_domain_simple_ops;
 #endif /* CONFIG_OF */
+       v->domain.ops = &irq_domain_simple_ops;
        irq_domain_add(&v->domain);
 }