irqchip: ingenic: Error out if IRQ domain creation failed
[ Upstream commit 52ecc87642f273a599c9913b29fd179c13de457b ] If we cannot create the IRQ domain, the driver should fail to probe instead of succeeding with just a warning message. Signed-off-by: Paul Cercueil <paul@crapouillou.net> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/1570015525-27018-3-git-send-email-zhouyanjie@zoho.com Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
276010d926
commit
c99e39a32e
@ -117,6 +117,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) +
|
||||||
@ -143,14 +151,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:
|
||||||
|
Loading…
Reference in New Issue
Block a user