From patchwork Tue Jun 28 10:31:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71011 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1510463qgy; Tue, 28 Jun 2016 03:36:28 -0700 (PDT) X-Received: by 10.98.149.149 with SMTP id c21mr509744pfk.73.1467110188059; Tue, 28 Jun 2016 03:36:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rq7si5486846pab.57.2016.06.28.03.36.27; Tue, 28 Jun 2016 03:36:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753169AbcF1KgY (ORCPT + 30 others); Tue, 28 Jun 2016 06:36:24 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36478 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbcF1Kee (ORCPT ); Tue, 28 Jun 2016 06:34:34 -0400 Received: by mail-wm0-f45.google.com with SMTP id f126so133942554wma.1 for ; Tue, 28 Jun 2016 03:34:33 -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=pXeDflHQGdqnqPISHUMBFmCrHD+I8PCh7rC7AxPOnEo=; b=QFFQiecF0hoCDO7CYqKJBVa+Qdn0NXtHXVvkT/BSuknJZdnjPedNtmj0NWoxjCKbDa yQ0UhQ48EWi104ZSlVPb98tZlWyOAlTlzzWXwemKRkB1XnJG5XVi2LdvHAukm1yjj1xE 6X6Bp7RUazWKplbeaDvQ55d6XeOM4QidvwM8o= 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=pXeDflHQGdqnqPISHUMBFmCrHD+I8PCh7rC7AxPOnEo=; b=dSD9XJ8QNGvNmZ/LCbTAHS6tIK2JnhfRc+54ZOR5ejS8RO6BA40674CSXgvVNAIhkI ectG23NMwJrPTB6pCS94K2eZwtiSAa/HiJfIIHdPRl4OyoYpXZSI2LZyyZuFtx3ytd3M hKXJsTkufr3ryo3olg4ZZM2EySajiHe3fGLMNjkmKbLDzr60kLEvpx8ziLyxXmuqfC1J GMjS5FdziIrkwwKYfvFh1lXCv1mjbJ6MmH24/5FigNpu3whebQ/xURlOQzIVm1lgoe4S ByOhxdYHXbw4Rbmzv8rCrjFmniCpkG742a1Ss+7VG/QG/Lpp+DVJTBz92B1acgKCPEQS CxZQ== X-Gm-Message-State: ALyK8tJZRLkEbroi00pzFtdL64rJLHy4NcFYHxqmT88IXr30NqvNPkkqHaBZhrtTyc0PhCa2 X-Received: by 10.194.104.196 with SMTP id gg4mr2653292wjb.112.1467110072690; Tue, 28 Jun 2016 03:34:32 -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 a84sm5377403wma.0.2016.06.28.03.34.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:32 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 69/92] clocksource/drivers/nps: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:28 +0200 Message-Id: <1467109911-11060-69-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467109911-11060-1-git-send-email-daniel.lezcano@linaro.org> References: <577251A4.7030508@linaro.org> <1467109911-11060-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Arnd Bergmann --- drivers/clocksource/timer-nps.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-nps.c b/drivers/clocksource/timer-nps.c index d461089..b5c7b2b 100644 --- a/drivers/clocksource/timer-nps.c +++ b/drivers/clocksource/timer-nps.c @@ -55,8 +55,8 @@ static cycle_t nps_clksrc_read(struct clocksource *clksrc) return (cycle_t)ioread32be(nps_msu_reg_low_addr[cluster]); } -static void __init nps_setup_clocksource(struct device_node *node, - struct clk *clk) +static int __init nps_setup_clocksource(struct device_node *node, + struct clk *clk) { int ret, cluster; @@ -68,7 +68,7 @@ static void __init nps_setup_clocksource(struct device_node *node, ret = clk_prepare_enable(clk); if (ret) { pr_err("Couldn't enable parent clock\n"); - return; + return ret; } nps_timer_rate = clk_get_rate(clk); @@ -79,20 +79,22 @@ static void __init nps_setup_clocksource(struct device_node *node, pr_err("Couldn't register clock source.\n"); clk_disable_unprepare(clk); } + + return ret; } -static void __init nps_timer_init(struct device_node *node) +static int __init nps_timer_init(struct device_node *node) { struct clk *clk; clk = of_clk_get(node, 0); if (IS_ERR(clk)) { pr_err("Can't get timer clock.\n"); - return; + return PTR_ERR(clk); } - nps_setup_clocksource(node, clk); + return nps_setup_clocksource(node, clk); } -CLOCKSOURCE_OF_DECLARE(ezchip_nps400_clksrc, "ezchip,nps400-timer", - nps_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(ezchip_nps400_clksrc, "ezchip,nps400-timer", + nps_timer_init);