From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753385AbcFTIBV (ORCPT ); Mon, 20 Jun 2016 04:01:21 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:56102 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753128AbcFTIBH (ORCPT ); Mon, 20 Jun 2016 04:01:07 -0400 Subject: Re: [PATCH V2 08/63] clocksource/drivers/st_lpc: Convert init function to return error To: Daniel Lezcano , References: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> <1466112442-31105-9-git-send-email-daniel.lezcano@linaro.org> CC: , Srinivas Kandagatla , Maxime Coquelin , "moderated list:ARM/STI ARCHITECTURE" , "open list:ARM/STI ARCHITECTURE" From: Patrice Chotard Message-ID: <57679DB2.4040102@st.com> Date: Mon, 20 Jun 2016 09:39:31 +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-9-git-send-email-daniel.lezcano@linaro.org> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.48.1.66] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-06-20_05:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Daniel On 06/16/2016 11:26 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 > --- > 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); Acked-by: Patrice Chotard