Commit 52ecc876 authored by Paul Cercueil's avatar Paul Cercueil Committed by Marc Zyngier

irqchip: ingenic: Error out if IRQ domain creation failed

If we cannot create the IRQ domain, the driver should fail to probe
instead of succeeding with just a warning message.
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/1570015525-27018-3-git-send-email-zhouyanjie@zoho.com
parent 20b44b4d
...@@ -87,6 +87,14 @@ static int __init ingenic_intc_of_init(struct device_node *node, ...@@ -87,6 +87,14 @@ static int __init ingenic_intc_of_init(struct device_node *node,
goto out_unmap_irq; goto out_unmap_irq;
} }
domain = irq_domain_add_legacy(node, num_chips * 32,
JZ4740_IRQ_BASE, 0,
&irq_domain_simple_ops, NULL);
if (!domain) {
err = -ENOMEM;
goto out_unmap_base;
}
for (i = 0; i < num_chips; i++) { for (i = 0; i < num_chips; i++) {
/* Mask all irqs */ /* Mask all irqs */
writel(0xffffffff, intc->base + (i * CHIP_SIZE) + writel(0xffffffff, intc->base + (i * CHIP_SIZE) +
...@@ -112,14 +120,11 @@ static int __init ingenic_intc_of_init(struct device_node *node, ...@@ -112,14 +120,11 @@ static int __init ingenic_intc_of_init(struct device_node *node,
IRQ_NOPROBE | IRQ_LEVEL); IRQ_NOPROBE | IRQ_LEVEL);
} }
domain = irq_domain_add_legacy(node, num_chips * 32, JZ4740_IRQ_BASE, 0,
&irq_domain_simple_ops, NULL);
if (!domain)
pr_warn("unable to register IRQ domain\n");
setup_irq(parent_irq, &intc_cascade_action); setup_irq(parent_irq, &intc_cascade_action);
return 0; return 0;
out_unmap_base:
iounmap(intc->base);
out_unmap_irq: out_unmap_irq:
irq_dispose_mapping(parent_irq); irq_dispose_mapping(parent_irq);
out_free: out_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment