From patchwork Thu Jun 16 21:26:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9181715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1457360776 for ; Thu, 16 Jun 2016 21:37:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0607827B13 for ; Thu, 16 Jun 2016 21:37:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE91A2838A; Thu, 16 Jun 2016 21:37:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 80F7B27B13 for ; Thu, 16 Jun 2016 21:37:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDex6-0005xC-Ff; Thu, 16 Jun 2016 21:35:52 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDeqJ-00038Z-VS for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 21:28:53 +0000 Received: by mail-wm0-x230.google.com with SMTP id m124so86959393wme.1 for ; Thu, 16 Jun 2016 14:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MQoWy90zJb732ens3inTOYRlnHPjxNUO5gUbjcew8Gs=; b=da7rFHyuaw7PVeZ0MRCCdDS/CYxjYC957zocLkaIyrTmZlzABHoVZqp9/A7Fhr7kis ypedq+/HJGnz/JB79SXmmNDcmB7aow5gFy/+wvHOYzLsSLH+LsBsBaMaMxyCdAEPbBj+ ewuSDN/yjpYLANjihjc2nSg/p4Y02iJyC+nxs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MQoWy90zJb732ens3inTOYRlnHPjxNUO5gUbjcew8Gs=; b=k2VHjEQft+TQ99htj8hQDIBvCIxVksIxbkzho/8q+EEiWY2N0YSbOglU5UJgyHI1xM LcooLwmvjid/TiSHWkrac1o+FE9WJNNy9cub6DSNJUp41UAcN2HrEs6y/K/7/oZ6De0s +TF+9ZjeJoU66CU3Xb7GJ6VqwgmEXkuclh/ysh03yJOmrIHvsImkFRB7NVlkFOq8xfy7 dx/IMFUcPAxts8wGmLBpPZKXZQqFrKbT4hXRPkHsfYUdoX3kxyKJI7wfpnNW4RFffWVt NYDwH4OOMT7A/dvlwP0Xr/HkabaCjAWB22armnzivq9qby/8D0FOH8n02QH3Fdugv+9U GDNA== X-Gm-Message-State: ALyK8tIIsL/lZ6Wf9yq6cJxsZ7NIQs2Hrg+lISEvpeJiu75wpK5eGIhkyI0hfo8crHI0dJD3 X-Received: by 10.194.216.33 with SMTP id on1mr1368620wjc.153.1466112515259; Thu, 16 Jun 2016 14:28:35 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id x128sm16705606wmf.6.2016.06.16.14.28.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:34 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH V2 25/63] clocksource/drivers/mxs_timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:44 +0200 Message-Id: <1466112442-31105-26-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> References: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160616_142852_393744_9082743A X-CRM114-Status: GOOD ( 14.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Liviu Dudau , linux-kernel@vger.kernel.org, "moderated list:ARM/VERSATILE EXP..." , Sudeep Holla MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 ++++++---- drivers/clocksource/mxs_timer.c | 2 +- 2 files changed, 7 insertions(+), 5 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); diff --git a/drivers/clocksource/mxs_timer.c b/drivers/clocksource/mxs_timer.c index f5ce296..16cf53b 100644 --- a/drivers/clocksource/mxs_timer.c +++ b/drivers/clocksource/mxs_timer.c @@ -226,7 +226,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) return 0; } -static void __init mxs_timer_init(struct device_node *np) +static int __init mxs_timer_init(struct device_node *np) { struct clk *timer_clk; int irq;