lkml.org 
[lkml]   [2020]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 053/191] irqchip: ingenic: Error out if IRQ domain creation failed
    Date
    From: Paul Cercueil <paul@crapouillou.net>

    [ 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>
    ---
    drivers/irqchip/irq-ingenic.c | 15 ++++++++++-----
    1 file changed, 10 insertions(+), 5 deletions(-)

    diff --git a/drivers/irqchip/irq-ingenic.c b/drivers/irqchip/irq-ingenic.c
    index f126255b3260..dda512dfe2c1 100644
    --- a/drivers/irqchip/irq-ingenic.c
    +++ b/drivers/irqchip/irq-ingenic.c
    @@ -108,6 +108,14 @@ static int __init ingenic_intc_of_init(struct device_node *node,
    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++) {
    /* Mask all irqs */
    writel(0xffffffff, intc->base + (i * CHIP_SIZE) +
    @@ -134,14 +142,11 @@ static int __init ingenic_intc_of_init(struct device_node *node,
    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);
    return 0;

    +out_unmap_base:
    + iounmap(intc->base);
    out_unmap_irq:
    irq_dispose_mapping(parent_irq);
    out_free:
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-03 00:00    [W:4.151 / U:1.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site