From patchwork Tue Jun 28 10:30: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: 70995 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1509487qgy; Tue, 28 Jun 2016 03:34:00 -0700 (PDT) X-Received: by 10.98.94.135 with SMTP id s129mr510589pfb.31.1467110037265; Tue, 28 Jun 2016 03:33:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 6si33071643pfe.203.2016.06.28.03.33.56; Tue, 28 Jun 2016 03:33:57 -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 S1752849AbcF1Kdw (ORCPT + 30 others); Tue, 28 Jun 2016 06:33:52 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38716 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752736AbcF1Kdd (ORCPT ); Tue, 28 Jun 2016 06:33:33 -0400 Received: by mail-wm0-f51.google.com with SMTP id r201so20895227wme.1 for ; Tue, 28 Jun 2016 03:33:24 -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=EHxG+OX5B787a0HIqm6GPYr/Q1iFUPGoMdNyie31tgU=; b=av3S8pkIZwsCagF+FBP/45+wQmIMnzOah0i6dWFJtVXFL3azyNxQvWGHbfKGxsYWC0 06k3KF0XEHH08YEFrNRtTvcsDswWsiT2XP3avppFC9wN9+jHil9wx77IAvPmwI61dJTB KJyAxIxwcg7M2yAcRJwM/XNTx5woLBk9rG2sA= 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=EHxG+OX5B787a0HIqm6GPYr/Q1iFUPGoMdNyie31tgU=; b=QH2NL7YWu/zl+FUVmo+QiAgW3gvuUjTeJWc7VQrRXTGBHB8BTf+rwD3OlmyXfpCpu8 d+lhuV2DkJEViovasL8GkXV/zyHvqXPpAjSG4i3D8AvkEaEdKLv3zged9mnMUCHXdxAD RscEh0DJ2C/Rcf6QVZhZ5z3Ht3Rt+n7AbaUeFhbam4cy6OkZVc0+xDhtabnrq2+f/+7r IrRizToitYKbAnFhLrJ9PCGlxNfaPiB7qi/3fzkI4cQT9wlG7A2iYiDuNgCKYJZHEoHf AF+ztgAc2wfmFQ6+9aXaw7W+T9GCrd2SdJerumKlYBzf2qMQKLw1pa3CLqIFlY2xcKGr 0VQQ== X-Gm-Message-State: ALyK8tI/nqd+NHjTfYEnsQKbcfViYh8U8BOT1zYrOFPJ0ao/aSazCXsPqrtdK2cRh0oL+ZcQ X-Received: by 10.28.157.199 with SMTP id g190mr2889956wme.2.1467110004065; Tue, 28 Jun 2016 03:33:24 -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.33.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:23 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Linus Walleij , linux-arm-kernel@lists.infradead.org Subject: [PATCH 25/92] clocksource/drivers/clksrc-dbx500: Convert init function to return error Date: Tue, 28 Jun 2016 12:30:44 +0200 Message-Id: <1467109911-11060-25-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 Acked-by: Linus Walleij --- drivers/clocksource/clksrc-dbx500-prcmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index dfad6eb..5a59d29 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -64,7 +64,7 @@ static u64 notrace dbx500_prcmu_sched_clock_read(void) #endif -static void __init clksrc_dbx500_prcmu_init(struct device_node *node) +static int __init clksrc_dbx500_prcmu_init(struct device_node *node) { clksrc_dbx500_timer_base = of_iomap(node, 0); @@ -84,7 +84,7 @@ static void __init clksrc_dbx500_prcmu_init(struct device_node *node) #ifdef CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK sched_clock_register(dbx500_prcmu_sched_clock_read, 32, RATE_32K); #endif - clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); + return clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); } -CLOCKSOURCE_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", +CLOCKSOURCE_OF_DECLARE_RET(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", clksrc_dbx500_prcmu_init);