diff options
author | Rob Herring <robh@kernel.org> | 2014-05-12 12:37:07 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-05-20 15:25:23 -0400 |
commit | 10776b5f48fe7d83e745856c2c8a14ab0a710bba (patch) | |
tree | 6479b74288bbaff002681597593eb7308df9b993 /drivers/irqchip | |
parent | 4f41083b87633c2277aad57c6a68e4250c5e7f1e (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')
-rw-r--r-- | drivers/irqchip/irq-mxs.c | 4 |
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 = { | |||
96 | .xlate = irq_domain_xlate_onecell, | 96 | .xlate = irq_domain_xlate_onecell, |
97 | }; | 97 | }; |
98 | 98 | ||
99 | static void __init icoll_of_init(struct device_node *np, | 99 | static int __init icoll_of_init(struct device_node *np, |
100 | struct device_node *interrupt_parent) | 100 | struct device_node *interrupt_parent) |
101 | { | 101 | { |
102 | icoll_base = of_iomap(np, 0); | 102 | icoll_base = of_iomap(np, 0); |
@@ -110,6 +110,6 @@ static void __init icoll_of_init(struct device_node *np, | |||
110 | 110 | ||
111 | icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS, | 111 | icoll_domain = irq_domain_add_linear(np, ICOLL_NUM_IRQS, |
112 | &icoll_irq_domain_ops, NULL); | 112 | &icoll_irq_domain_ops, NULL); |
113 | WARN_ON(!icoll_domain); | 113 | return icoll_domain ? 0 : -ENODEV; |
114 | } | 114 | } |
115 | IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init); | 115 | IRQCHIP_DECLARE(mxs, "fsl,icoll", icoll_of_init); |