public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clocksource/drivers/st_lpc: Convert init function to return error

Browse source 
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>
Acked-by: Patrice Chotard <patrice.chotard@st.com>
Acked-by: Maxime Coquelin <maxime.coquelin@st.com>
This commit is contained in:
Daniel Lezcano 2016-06-01 00:34:25 +02:00
parent 70504f311d
commit 84309e0abd
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/clocksource/clksrc_st_lpc.c
View file

@ -92,7 +92,7 @@ static int __init st_clksrc_setup_clk(struct device_node *np)
return 0; return 0;
} }
static void __init st_clksrc_of_register(struct device_node *np) static int __init st_clksrc_of_register(struct device_node *np)
{ {
int ret; int ret;
uint32_t mode; uint32_t mode;
@ -100,32 +100,36 @@ static void __init st_clksrc_of_register(struct device_node *np)
ret = of_property_read_u32(np, "st,lpc-mode", &mode); ret = of_property_read_u32(np, "st,lpc-mode", &mode);
if (ret) { if (ret) {
pr_err("clksrc-st-lpc: An LPC mode must be provided\n"); pr_err("clksrc-st-lpc: An LPC mode must be provided\n");
return; return ret;
} }
/* LPC can either run as a Clocksource or in RTC or WDT mode */ /* LPC can either run as a Clocksource or in RTC or WDT mode */
if (mode != ST_LPC_MODE_CLKSRC) if (mode != ST_LPC_MODE_CLKSRC)
return; return 0;
ddata.base = of_iomap(np, 0); ddata.base = of_iomap(np, 0);
if (!ddata.base) { if (!ddata.base) {
pr_err("clksrc-st-lpc: Unable to map iomem\n"); pr_err("clksrc-st-lpc: Unable to map iomem\n");
return; return -ENXIO;
} }
if (st_clksrc_setup_clk(np)) { ret = st_clksrc_setup_clk(np);
if (ret) {
iounmap(ddata.base); iounmap(ddata.base);
return; return ret;
} }
if (st_clksrc_init()) { ret = st_clksrc_init();
if (ret) {
clk_disable_unprepare(ddata.clk); clk_disable_unprepare(ddata.clk);
clk_put(ddata.clk); clk_put(ddata.clk);
iounmap(ddata.base); iounmap(ddata.base);
return; return ret;
} }
pr_info("clksrc-st-lpc: clocksource initialised - running @ %luHz\n", pr_info("clksrc-st-lpc: clocksource initialised - running @ %luHz\n",
clk_get_rate(ddata.clk)); clk_get_rate(ddata.clk));
return ret;
} }
CLOCKSOURCE_OF_DECLARE(ddata, "st,stih407-lpc", st_clksrc_of_register); CLOCKSOURCE_OF_DECLARE_RET(ddata, "st,stih407-lpc", st_clksrc_of_register);