lkml.org 
[lkml]   [2016]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 03/63] clocksource/drivers/rockchip_timer: 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/rockchip_timer.c | 26 ++++++++++++++------------
    1 file changed, 14 insertions(+), 12 deletions(-)

    diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c
    index a3f22b0..d10bdee 100644
    --- a/drivers/clocksource/rockchip_timer.c
    +++ b/drivers/clocksource/rockchip_timer.c
    @@ -113,17 +113,17 @@ static irqreturn_t rk_timer_interrupt(int irq, void *dev_id)
    return IRQ_HANDLED;
    }

    -static void __init rk_timer_init(struct device_node *np, u32 ctrl_reg)
    +static int __init rk_timer_init(struct device_node *np, u32 ctrl_reg)
    {
    struct clock_event_device *ce = &bc_timer.ce;
    struct clk *timer_clk;
    struct clk *pclk;
    - int ret, irq;
    + int ret = -EINVAL, irq;

    bc_timer.base = of_iomap(np, 0);
    if (!bc_timer.base) {
    pr_err("Failed to get base address for '%s'\n", TIMER_NAME);
    - return;
    + return -ENXIO;
    }
    bc_timer.ctrl = bc_timer.base + ctrl_reg;

    @@ -178,7 +178,7 @@ static void __init rk_timer_init(struct device_node *np, u32 ctrl_reg)

    clockevents_config_and_register(ce, bc_timer.freq, 1, UINT_MAX);

    - return;
    + return 0;

    out_irq:
    clk_disable_unprepare(timer_clk);
    @@ -186,19 +186,21 @@ out_timer_clk:
    clk_disable_unprepare(pclk);
    out_unmap:
    iounmap(bc_timer.base);
    +
    + return ret;
    }

    -static void __init rk3288_timer_init(struct device_node *np)
    +static int __init rk3288_timer_init(struct device_node *np)
    {
    - rk_timer_init(np, TIMER_CONTROL_REG3288);
    + return rk_timer_init(np, TIMER_CONTROL_REG3288);
    }

    -static void __init rk3399_timer_init(struct device_node *np)
    +static int __init rk3399_timer_init(struct device_node *np)
    {
    - rk_timer_init(np, TIMER_CONTROL_REG3399);
    + return rk_timer_init(np, TIMER_CONTROL_REG3399);
    }

    -CLOCKSOURCE_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer",
    - rk3288_timer_init);
    -CLOCKSOURCE_OF_DECLARE(rk3399_timer, "rockchip,rk3399-timer",
    - rk3399_timer_init);
    +CLOCKSOURCE_OF_DECLARE_RET(rk3288_timer, "rockchip,rk3288-timer",
    + rk3288_timer_init);
    +CLOCKSOURCE_OF_DECLARE_RET(rk3399_timer, "rockchip,rk3399-timer",
    + rk3399_timer_init);
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-06-17 00:21    [W:4.774 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site