From patchwork Thu Jun 16 21:27:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70233 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp465259qgy; Thu, 16 Jun 2016 14:31:01 -0700 (PDT) X-Received: by 10.36.3.145 with SMTP id e139mr11826548ite.40.1466112661797; Thu, 16 Jun 2016 14:31:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lt12si13478344pab.152.2016.06.16.14.31.01; Thu, 16 Jun 2016 14:31:01 -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 S1755004AbcFPVa7 (ORCPT + 30 others); Thu, 16 Jun 2016 17:30:59 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37351 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754580AbcFPV3d (ORCPT ); Thu, 16 Jun 2016 17:29:33 -0400 Received: by mail-wm0-f54.google.com with SMTP id a66so75569671wme.0 for ; Thu, 16 Jun 2016 14:29:32 -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=EmpHTC2WNHkWjcWx5df/8EpateO46G4uZiUvbyZzYtYhi8skhHeNOI6+vaYm+Hvre2 Cc3b11J0ROMX16A2wD0yCN25MMOUiXmwc5O7amjwzCoz+3FQjDzvn2NpgCzZNgO4H09t YzRHnxCloIiGdeEIAcpQQ24NHkiVMyHTKRBuo= 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=CmyIRCUJjZw99+ssmAr9HdurT0uStqZazeCoMQocuF9YgjzjxeQ1ugAZYa6KzzIO0L Be30pXByd7/H7gfFqEfKYO+1Q/3VXd4mOyNb8KHzT4a4HIAV9Yreh7Zcwuy8ET5UgUeR XOhQX846WgoxyjvMi+xZf44uRkqUSqHE5WBpaQy6Rm5SMEf/rGPPhLQiMLFPidFgIudG weUuoCFbBfKbF+Ela1EG8GvOTSaaixczDIYn6HpxeE04ofk2PCYqVZPXtFS7yw59Sdns STMT1QNsTeO3sdiJV5QIU0sR+FBq7j3u+A2SAtg8a7pHjetNkrvC7FhF+hWXsl1GpQSC 72xQ== X-Gm-Message-State: ALyK8tJOPqbOxkwGkQ+TBKzRQI+p2avEqu+pE+H6LclhSxGDI7iDKH6flt4sFO3dD1ug2E0T X-Received: by 10.28.181.146 with SMTP id e140mr6533818wmf.38.1466112572172; Thu, 16 Jun 2016 14:29: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 x128sm16705606wmf.6.2016.06.16.14.29.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:31 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH V2 60/63] clocksource/drivers/nps: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:19 +0200 Message-Id: <1466112442-31105-61-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> 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);