From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754302AbcFTJmk (ORCPT ); Mon, 20 Jun 2016 05:42:40 -0400 Received: from foss.arm.com ([217.140.101.70]:59621 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754282AbcFTJmd (ORCPT ); Mon, 20 Jun 2016 05:42:33 -0400 Date: Mon, 20 Jun 2016 10:42:30 +0100 From: liviu.dudau@arm.com To: Daniel Lezcano Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH V3] clocksource/drivers/mps2-timer: Convert init function to return error Message-ID: <20160620094230.GQ9711@e106497-lin.cambridge.arm.com> References: <20160620091506.GO9711@e106497-lin.cambridge.arm.com> <1466414820-19574-1-git-send-email-daniel.lezcano@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1466414820-19574-1-git-send-email-daniel.lezcano@linaro.org> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 20, 2016 at 11:26:59AM +0200, 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/mps2-timer.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c > index 3d33a5e..c303fa9 100644 > --- a/drivers/clocksource/mps2-timer.c > +++ b/drivers/clocksource/mps2-timer.c > @@ -250,7 +250,7 @@ out: > return ret; > } > > -static void __init mps2_timer_init(struct device_node *np) > +static int __init mps2_timer_init(struct device_node *np) > { > static int has_clocksource, has_clockevent; > int ret; > @@ -259,7 +259,7 @@ static void __init mps2_timer_init(struct device_node *np) > ret = mps2_clocksource_init(np); > if (!ret) { > has_clocksource = 1; > - return; > + return 0; > } > } > > @@ -267,9 +267,11 @@ static void __init mps2_timer_init(struct device_node *np) > ret = mps2_clockevent_init(np); > if (!ret) { > has_clockevent = 1; > - return; > + return 0; > } > } > + > + return 0; > } > > -CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); > +CLOCKSOURCE_OF_DECLARE_RET(mps2_timer, "arm,mps2-timer", mps2_timer_init); > -- > 1.9.1 > Thanks! Acked-by: Liviu Dudau -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ From mboxrd@z Thu Jan 1 00:00:00 1970 From: liviu.dudau@arm.com (liviu.dudau at arm.com) Date: Mon, 20 Jun 2016 10:42:30 +0100 Subject: [PATCH V3] clocksource/drivers/mps2-timer: Convert init function to return error In-Reply-To: <1466414820-19574-1-git-send-email-daniel.lezcano@linaro.org> References: <20160620091506.GO9711@e106497-lin.cambridge.arm.com> <1466414820-19574-1-git-send-email-daniel.lezcano@linaro.org> Message-ID: <20160620094230.GQ9711@e106497-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Jun 20, 2016 at 11:26:59AM +0200, 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/mps2-timer.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c > index 3d33a5e..c303fa9 100644 > --- a/drivers/clocksource/mps2-timer.c > +++ b/drivers/clocksource/mps2-timer.c > @@ -250,7 +250,7 @@ out: > return ret; > } > > -static void __init mps2_timer_init(struct device_node *np) > +static int __init mps2_timer_init(struct device_node *np) > { > static int has_clocksource, has_clockevent; > int ret; > @@ -259,7 +259,7 @@ static void __init mps2_timer_init(struct device_node *np) > ret = mps2_clocksource_init(np); > if (!ret) { > has_clocksource = 1; > - return; > + return 0; > } > } > > @@ -267,9 +267,11 @@ static void __init mps2_timer_init(struct device_node *np) > ret = mps2_clockevent_init(np); > if (!ret) { > has_clockevent = 1; > - return; > + return 0; > } > } > + > + return 0; > } > > -CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); > +CLOCKSOURCE_OF_DECLARE_RET(mps2_timer, "arm,mps2-timer", mps2_timer_init); > -- > 1.9.1 > Thanks! Acked-by: Liviu Dudau -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ?\_(?)_/?