From: Daniel Lezcano <daniel.lezcano@linaro.org> To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Srinivas Kandagatla <srinivas.kandagatla@gmail.com>, Maxime Coquelin <maxime.coquelin@st.com>, Patrice Chotard <patrice.chotard@st.com>, linux-arm-kernel@lists.infradead.org (moderated list:ARM/STI ARCHITECTURE), kernel@stlinux.com (open list:ARM/STI ARCHITECTURE) Subject: [PATCH 8/9] clocksource/drivers/st_lpc: Convert init function to return error Date: Wed, 1 Jun 2016 10:34:51 +0200 [thread overview] Message-ID: <1464770093-12667-9-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1464770093-12667-1-git-send-email-daniel.lezcano@linaro.org> 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/clksrc_st_lpc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c index 65ec467..c9022a9 100644 --- a/drivers/clocksource/clksrc_st_lpc.c +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -92,7 +92,7 @@ static int __init st_clksrc_setup_clk(struct device_node *np) 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; 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); if (ret) { 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 */ if (mode != ST_LPC_MODE_CLKSRC) - return; + return 0; ddata.base = of_iomap(np, 0); if (!ddata.base) { 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); - return; + return ret; } - if (st_clksrc_init()) { + ret = st_clksrc_init(); + if (ret) { clk_disable_unprepare(ddata.clk); clk_put(ddata.clk); iounmap(ddata.base); - return; + return ret; } pr_info("clksrc-st-lpc: clocksource initialised - running @ %luHz\n", 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); -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: daniel.lezcano@linaro.org (Daniel Lezcano) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 8/9] clocksource/drivers/st_lpc: Convert init function to return error Date: Wed, 1 Jun 2016 10:34:51 +0200 [thread overview] Message-ID: <1464770093-12667-9-git-send-email-daniel.lezcano@linaro.org> (raw) In-Reply-To: <1464770093-12667-1-git-send-email-daniel.lezcano@linaro.org> 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/clksrc_st_lpc.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/clocksource/clksrc_st_lpc.c b/drivers/clocksource/clksrc_st_lpc.c index 65ec467..c9022a9 100644 --- a/drivers/clocksource/clksrc_st_lpc.c +++ b/drivers/clocksource/clksrc_st_lpc.c @@ -92,7 +92,7 @@ static int __init st_clksrc_setup_clk(struct device_node *np) 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; 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); if (ret) { 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 */ if (mode != ST_LPC_MODE_CLKSRC) - return; + return 0; ddata.base = of_iomap(np, 0); if (!ddata.base) { 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); - return; + return ret; } - if (st_clksrc_init()) { + ret = st_clksrc_init(); + if (ret) { clk_disable_unprepare(ddata.clk); clk_put(ddata.clk); iounmap(ddata.base); - return; + return ret; } pr_info("clksrc-st-lpc: clocksource initialised - running @ %luHz\n", 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); -- 1.9.1
next prev parent reply other threads:[~2016-06-01 8:35 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-06-01 8:34 [PATCH 0/9] clocksource/drivers/clksrc-of: Improve error handling Daniel Lezcano 2016-06-01 8:34 ` [PATCH 1/9] of: Add a new macro to declare_of for one parameter function returning a value Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-14 7:41 ` Daniel Lezcano 2016-06-14 7:41 ` Daniel Lezcano 2016-06-01 8:34 ` [PATCH 2/9] clocksource/drivers/clksrc-probe: Introduce init functions with return code Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 8:34 ` [PATCH 3/9] clocksource/drivers/rockchip_timer: Convert init function to return error Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 8:34 ` [PATCH 4/9] clocksource/drivers/mkt_timer: " Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 8:34 ` [PATCH 5/9] clocksource/drivers/exynos_mct: " Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-06 10:51 ` Krzysztof Kozlowski 2016-06-06 10:51 ` Krzysztof Kozlowski 2016-06-06 10:51 ` Krzysztof Kozlowski 2016-06-06 11:23 ` Daniel Lezcano 2016-06-06 11:23 ` Daniel Lezcano 2016-06-06 11:23 ` Daniel Lezcano 2016-06-06 11:28 ` Krzysztof Kozlowski 2016-06-06 11:28 ` Krzysztof Kozlowski 2016-06-06 11:28 ` Krzysztof Kozlowski 2016-06-01 8:34 ` [PATCH 6/9] clocksource/drivers/asm9260: " Daniel Lezcano 2016-06-01 8:34 ` [PATCH 7/9] clocksource/drivers/cadence_ttc: " Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano 2016-06-01 14:36 ` Sören Brinkmann 2016-06-01 14:36 ` Sören Brinkmann 2016-06-01 14:43 ` Daniel Lezcano 2016-06-01 14:43 ` Daniel Lezcano 2016-06-01 8:34 ` Daniel Lezcano [this message] 2016-06-01 8:34 ` [PATCH 8/9] clocksource/drivers/st_lpc: " Daniel Lezcano 2016-06-01 8:34 ` [PATCH 9/9] clocksource/drivers/dw_apb_timer: " Daniel Lezcano 2016-06-07 9:54 ` [PATCH 0/9] clocksource/drivers/clksrc-of: Improve error handling Geert Uytterhoeven 2016-06-07 11:35 ` Daniel Lezcano 2016-06-07 22:23 ` Daniel Lezcano 2016-06-08 14:10 ` Daniel Lezcano 2016-06-09 7:46 ` Geert Uytterhoeven 2016-06-09 7:49 ` Daniel Lezcano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1464770093-12667-9-git-send-email-daniel.lezcano@linaro.org \ --to=daniel.lezcano@linaro.org \ --cc=kernel@stlinux.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maxime.coquelin@st.com \ --cc=patrice.chotard@st.com \ --cc=srinivas.kandagatla@gmail.com \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.