From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755400AbcFQI74 (ORCPT ); Fri, 17 Jun 2016 04:59:56 -0400 Received: from smtprelay4.synopsys.com ([198.182.47.9]:37238 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753942AbcFQI7y (ORCPT ); Fri, 17 Jun 2016 04:59:54 -0400 Subject: Re: [PATCH V2 61/63] clocksource/drivers/arc: Convert init function to return error To: Daniel Lezcano , References: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> <1466112442-31105-62-git-send-email-daniel.lezcano@linaro.org> CC: , Noam Camus , "Viresh Kumar" , Adam Buchbinder , "open list:SYNOPSYS ARC ARCH..." Newsgroups: gmane.linux.kernel,gmane.linux.kernel.arc From: Vineet Gupta Message-ID: <5763BC00.1030101@synopsys.com> Date: Fri, 17 Jun 2016 10:59:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <1466112442-31105-62-git-send-email-daniel.lezcano@linaro.org> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.100.21.13] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 > --- [...] > > @@ -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