From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932181AbcFTJPK (ORCPT ); Mon, 20 Jun 2016 05:15:10 -0400 Received: from foss.arm.com ([217.140.101.70]:59328 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751982AbcFTJNz (ORCPT ); Mon, 20 Jun 2016 05:13:55 -0400 Date: Mon, 20 Jun 2016 10:13:53 +0100 From: Liviu Dudau To: Daniel Lezcano Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, Sudeep Holla , Lorenzo Pieralisi , "moderated list:ARM/VERSATILE EXP..." Subject: Re: [PATCH V2 51/63] clocksource/drivers/versatile: Convert init function to return error Message-ID: <20160620091353.GN9711@e106497-lin.cambridge.arm.com> References: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> <1466112442-31105-52-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: <1466112442-31105-52-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 Thu, Jun 16, 2016 at 11:27:10PM +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/versatile.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c > index 0a26d3d..8daeffa 100644 > --- a/drivers/clocksource/versatile.c > +++ b/drivers/clocksource/versatile.c > @@ -25,18 +25,20 @@ static u64 notrace versatile_sys_24mhz_read(void) > return readl(versatile_sys_24mhz); > } > > -static void __init versatile_sched_clock_init(struct device_node *node) > +static int __init versatile_sched_clock_init(struct device_node *node) > { > void __iomem *base = of_iomap(node, 0); > > if (!base) > - return; > + return -ENXIO; > > versatile_sys_24mhz = base + SYS_24MHZ; > > sched_clock_register(versatile_sys_24mhz_read, 32, 24000000); > + > + return 0; > } > -CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg", > +CLOCKSOURCE_OF_DECLARE_RET(vexpress, "arm,vexpress-sysreg", > versatile_sched_clock_init); > -CLOCKSOURCE_OF_DECLARE(versatile, "arm,versatile-sysreg", > +CLOCKSOURCE_OF_DECLARE_RET(versatile, "arm,versatile-sysreg", > versatile_sched_clock_init); > -- > 1.9.1 > Acked-by: Liviu Dudau -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯