lkml.org 
[lkml]   [2014]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] irqchip: mxs: fix function type for IRQCHIP_OF_DECLARE
    Date
    From: Rob Herring <robh@kernel.org>

    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>
    ---
    drivers/irqchip/irq-mxs.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/irqchip/irq-mxs.c b/drivers/irqchip/irq-mxs.c
    index 63b3d4e..4044ff2 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);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-05-13 03:21    [W:3.854 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site