提交 8595b1ba 编写于 作者: D Daniel Lezcano

clocksource/drivers/oxnas-rps: Convert init function to return error

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: NDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: NNeil Armstrong <narmstrong@baylibre.com>
上级 43d75604
...@@ -220,32 +220,37 @@ static int __init oxnas_rps_clocksource_init(struct oxnas_rps_timer *rps) ...@@ -220,32 +220,37 @@ static int __init oxnas_rps_clocksource_init(struct oxnas_rps_timer *rps)
return 0; return 0;
} }
static void __init oxnas_rps_timer_init(struct device_node *np) static int __init oxnas_rps_timer_init(struct device_node *np)
{ {
struct oxnas_rps_timer *rps; struct oxnas_rps_timer *rps;
void __iomem *base; void __iomem *base;
int ret; int ret;
rps = kzalloc(sizeof(*rps), GFP_KERNEL); rps = kzalloc(sizeof(*rps), GFP_KERNEL);
if (!rps) { if (!rps)
pr_err("Failed to allocate rps structure\n"); return -ENOMEM;
return;
}
rps->clk = of_clk_get(np, 0); rps->clk = of_clk_get(np, 0);
if (WARN_ON(IS_ERR(rps->clk))) if (IS_ERR(rps->clk)) {
ret = PTR_ERR(rps->clk);
goto err_alloc; goto err_alloc;
}
if (WARN_ON(clk_prepare_enable(rps->clk))) ret = clk_prepare_enable(rps->clk);
if (ret)
goto err_clk; goto err_clk;
base = of_iomap(np, 0); base = of_iomap(np, 0);
if (WARN_ON(!base)) if (!base) {
ret = -ENXIO;
goto err_clk_prepare; goto err_clk_prepare;
}
rps->irq = irq_of_parse_and_map(np, 0); rps->irq = irq_of_parse_and_map(np, 0);
if (WARN_ON(rps->irq < 0)) if (rps->irq < 0) {
ret = -EINVAL;
goto err_iomap; goto err_iomap;
}
rps->clkevt_base = base + TIMER1_REG_OFFSET; rps->clkevt_base = base + TIMER1_REG_OFFSET;
rps->clksrc_base = base + TIMER2_REG_OFFSET; rps->clksrc_base = base + TIMER2_REG_OFFSET;
...@@ -261,7 +266,7 @@ static void __init oxnas_rps_timer_init(struct device_node *np) ...@@ -261,7 +266,7 @@ static void __init oxnas_rps_timer_init(struct device_node *np)
ret = request_irq(rps->irq, oxnas_rps_timer_irq, ret = request_irq(rps->irq, oxnas_rps_timer_irq,
IRQF_TIMER | IRQF_IRQPOLL, IRQF_TIMER | IRQF_IRQPOLL,
"rps-timer", rps); "rps-timer", rps);
if (WARN_ON(ret)) if (ret)
goto err_iomap; goto err_iomap;
ret = oxnas_rps_clocksource_init(rps); ret = oxnas_rps_clocksource_init(rps);
...@@ -272,7 +277,7 @@ static void __init oxnas_rps_timer_init(struct device_node *np) ...@@ -272,7 +277,7 @@ static void __init oxnas_rps_timer_init(struct device_node *np)
if (ret) if (ret)
goto err_irqreq; goto err_irqreq;
return; return 0;
err_irqreq: err_irqreq:
free_irq(rps->irq, rps); free_irq(rps->irq, rps);
...@@ -284,7 +289,9 @@ static void __init oxnas_rps_timer_init(struct device_node *np) ...@@ -284,7 +289,9 @@ static void __init oxnas_rps_timer_init(struct device_node *np)
clk_put(rps->clk); clk_put(rps->clk);
err_alloc: err_alloc:
kfree(rps); kfree(rps);
return ret;
} }
CLOCKSOURCE_OF_DECLARE(ox810se_rps, CLOCKSOURCE_OF_DECLARE_RET(ox810se_rps,
"oxsemi,ox810se-rps-timer", oxnas_rps_timer_init); "oxsemi,ox810se-rps-timer", oxnas_rps_timer_init);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册