summaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-mxs.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-05-12 11:37:07 -0500
committerRob Herring <robh@kernel.org>2014-05-20 14:25:23 -0500
commit10776b5f48fe7d83e745856c2c8a14ab0a710bba (patch)
tree6479b74288bbaff002681597593eb7308df9b993 /drivers/irqchip/irq-mxs.c
parent4f41083b87633c2277aad57c6a68e4250c5e7f1e (diff)
irqchip: mxs: Fix function type for IRQCHIP_OF_DECLARE
Adding function type checking to IRQCHIP_OF_DECLARE found a type mismatch with icoll_of_init. The function should return an error code or 0 on success. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Acked-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'drivers/irqchip/irq-mxs.c')
-rw-r--r--drivers/irqchip/irq-mxs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c
index 63b3d4eb0ef7..4044ff287663 100644
--- a/drivers/irqchip/irq-mxs.c
+++ b/drivers/irqchip/irq-mxs.c
@@ -96,7 +96,7 @@ static struct irq_domain_ops icoll_irq_domain_ops = {
.xlate = irq_domain_xlate_onecell,
};
-static void __init icoll_of_init(struct device_node *np,
+static int __init icoll_of_init(struct device_node *np,
struct device_node *interrupt_parent)
{
icoll_base = of_iomap(np, 0);
@@ -110,6 +110,6 @@ static void __init icoll_of_init(struct device_node *np,
icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS,
&icoll_irq_domain_ops, NULL);
- WARN_ON(!icoll_domain);
+ return icoll_domain ? 0 : -ENODEV;
}
IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init);