lkml.org 
[lkml]   [2016]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/93] clocksource/drivers/asm9260: Convert init function to return error
    Date
    The init functions do not return any error. They behave as the following:

    - panic, thus leading to a kernel crash while another timer may work and
    make the system boot up correctly

    or

    - print an error and let the caller unaware if the state of the system

    Change that by converting the init functions to return an error conforming
    to the CLOCKSOURCE_OF_RET prototype.

    Proper error handling (rollback, errno value) will be changed later case
    by case, thus this change just return back an error or success in the init
    function.

    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    ---
    drivers/clocksource/asm9260_timer.c | 24 ++++++++++++++++--------
    1 file changed, 16 insertions(+), 8 deletions(-)

    diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c
    index 217438d..d113c02 100644
    --- a/drivers/clocksource/asm9260_timer.c
    +++ b/drivers/clocksource/asm9260_timer.c
    @@ -184,7 +184,7 @@ static irqreturn_t asm9260_timer_interrupt(int irq, void *dev_id)
    * Timer initialization
    * ---------------------------------------------------------------------------
    */
    -static void __init asm9260_timer_init(struct device_node *np)
    +static int __init asm9260_timer_init(struct device_node *np)
    {
    int irq;
    struct clk *clk;
    @@ -192,20 +192,26 @@ static void __init asm9260_timer_init(struct device_node *np)
    unsigned long rate;

    priv.base = of_io_request_and_map(np, 0, np->name);
    - if (IS_ERR(priv.base))
    - panic("%s: unable to map resource", np->name);
    + if (IS_ERR(priv.base)) {
    + pr_err("%s: unable to map resource", np->name);
    + return PTR_ERR(priv.base);
    + }

    clk = of_clk_get(np, 0);

    ret = clk_prepare_enable(clk);
    - if (ret)
    - panic("Failed to enable clk!\n");
    + if (ret) {
    + pr_err("Failed to enable clk!\n");
    + return ret;
    + }

    irq = irq_of_parse_and_map(np, 0);
    ret = request_irq(irq, asm9260_timer_interrupt, IRQF_TIMER,
    DRIVER_NAME, &event_dev);
    - if (ret)
    - panic("Failed to setup irq!\n");
    + if (ret) {
    + pr_err("Failed to setup irq!\n");
    + return ret;
    + }

    /* set all timers for count-up */
    writel_relaxed(BM_DIR_DEFAULT, priv.base + HW_DIR);
    @@ -229,6 +235,8 @@ static void __init asm9260_timer_init(struct device_node *np)
    priv.ticks_per_jiffy = DIV_ROUND_CLOSEST(rate, HZ);
    event_dev.cpumask = cpumask_of(0);
    clockevents_config_and_register(&event_dev, rate, 0x2c00, 0xfffffffe);
    +
    + return 0;
    }
    -CLOCKSOURCE_OF_DECLARE(asm9260_timer, "alphascale,asm9260-timer",
    +CLOCKSOURCE_OF_DECLARE_RET(asm9260_timer, "alphascale,asm9260-timer",
    asm9260_timer_init);
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-07-07 11:21    [W:4.301 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site