From: Vineet.Gupta1@synopsys.com (Vineet Gupta)
To: linux-snps-arc@lists.infradead.org
Subject: [PATCH V2 61/63] clocksource/drivers/arc: Convert init function to return error
Date: Fri, 17 Jun 2016 10:59:44 +0200 [thread overview]
Message-ID: <5763BC00.1030101@synopsys.com> (raw)
In-Reply-To: <1466112442-31105-62-git-send-email-daniel.lezcano@linaro.org>
On Thursday 16 June 2016 11:27 PM, Daniel Lezcano wrote:
> 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 at linaro.org>
> ---
[...]
>
> @@ -172,27 +172,27 @@ static struct clocksource arc_counter_rtc = {
> .flags = CLOCK_SOURCE_IS_CONTINUOUS,
> };
>
> -static void __init arc_cs_setup_rtc(struct device_node *node)
> +static int __init arc_cs_setup_rtc(struct device_node *node)
> {
> int exists = cpuinfo_arc700[smp_processor_id()].extn.rtc;
> int ret;
>
> if (WARN(!exists, "Local-64-bit-Ctr clocksource not detected"))
> - return;
> + return -ENXIO;
>
> /* Local to CPU hence not usable in SMP */
> if (WARN(IS_ENABLED(CONFIG_SMP), "Local-64-bit-Ctr not usable in SMP"))
> - return;
> + return -EINVAL;
>
> ret = arc_get_timer_clk(node);
> if (ret)
> - return;
> + return ret;
>
> write_aux_reg(AUX_RTC_CTRL, 1);
>
> - clocksource_register_hz(&arc_counter_rtc, arc_timer_freq);
> + return clocksource_register_hz(&arc_counter_rtc, arc_timer_freq);
> }
> -CLOCKSOURCE_OF_DECLARE(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);
> +CLOCKSOURCE_OF_DECLARE_RET(arc_rtc, "snps,archs-timer-rtc", arc_cs_setup_rtc);
>
> #endif
>
> @@ -213,23 +213,23 @@ static struct clocksource arc_counter_timer1 = {
> .flags = CLOCK_SOURCE_IS_CONTINUOUS,
> };
>
> -static void __init arc_cs_setup_timer1(struct device_node *node)
> +static int __init arc_cs_setup_timer1(struct device_node *node)
> {
> int ret;
>
> /* Local to CPU hence not usable in SMP */
> if (IS_ENABLED(CONFIG_SMP))
> - return;
> + return 0;
-EINVAL to keep it similar as rtc above
next prev parent reply other threads:[~2016-06-17 8:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org>
2016-06-16 21:27 ` [PATCH V2 61/63] clocksource/drivers/arc: Convert init function to return error Daniel Lezcano
2016-06-17 8:59 ` Vineet Gupta [this message]
2016-06-17 10:09 ` [PATCH V3] " Daniel Lezcano
2016-06-17 14:30 ` Vineet Gupta
2016-06-24 4:06 ` Vineet Gupta
2016-06-24 6:41 ` Daniel Lezcano
2016-06-24 7:52 ` Vineet Gupta
2016-06-24 7:55 ` Daniel Lezcano
2016-06-16 21:27 ` [PATCH V2 63/63] clocksources: Switch back to the clksrc table Daniel Lezcano
2016-06-17 8:36 ` Krzysztof Kozlowski
2016-06-17 16:04 ` Santosh Shilimkar
2016-06-17 16:18 ` Matthias Brugger
2016-06-18 13:48 ` Heiko Stübner
2016-06-20 7:43 ` Patrice Chotard
2016-06-20 9:17 ` Liviu Dudau
2016-06-20 9:19 ` Neil Armstrong
2016-06-20 17:03 ` Sylvain Lemieux
2016-06-21 6:00 ` Ray Jui
2016-06-21 6:45 ` Noam Camus
2016-06-24 7:13 ` Chen-Yu Tsai
2016-06-24 20:12 ` Carlo Caione
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=5763BC00.1030101@synopsys.com \
--to=vineet.gupta1@synopsys.com \
--cc=linux-snps-arc@lists.infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).