From patchwork Thu Jun 16 21:26:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70267 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp469419qgy; Thu, 16 Jun 2016 14:43:35 -0700 (PDT) X-Received: by 10.67.7.199 with SMTP id de7mr7616250pad.94.1466113415259; Thu, 16 Jun 2016 14:43:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c185si8035170pfa.116.2016.06.16.14.43.34; Thu, 16 Jun 2016 14:43:35 -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 S1754697AbcFPVnc (ORCPT + 30 others); Thu, 16 Jun 2016 17:43:32 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:38147 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754879AbcFPV23 (ORCPT ); Thu, 16 Jun 2016 17:28:29 -0400 Received: by mail-wm0-f46.google.com with SMTP id m124so86956324wme.1 for ; Thu, 16 Jun 2016 14:28:29 -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=9xx9ud0jmuaV7LxadLQ0AYjN5rqoVBzHb2jRCUhav0E=; b=ehjaFkgWrgFHc0M3Nwskg2+OWnhhfDqdWGtRDwakOZS4TX/pWHHydzoUTipo9iD/90 Pvk8numDpwy5L+p0ybwSnMGxSM3rrZY+YaoKWDyZE0FZfqXoaVzHqtStL6/18wqHQuS0 HgGsyxhbJANFbixbjImHcKQ3LXXh2MxkRXeBQ= 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=9xx9ud0jmuaV7LxadLQ0AYjN5rqoVBzHb2jRCUhav0E=; b=epS76ZJo6fKZBGR8nYqCNA5qb2EoZym7OxvP9/JcKodtHYG39EACV+DGKCPNXegte0 yKilEipz2EPhOsVwSYWaMtQGiDOqqP+l/7Rq55dZNKYD6boPvXvYUxcou6EibrtpqjXl sxaXmWHCuCNUQWzCdnX16GDuEQHSNiW7NVLlprmdb5kRJe82B1knzoLowoAJW5aAdxFH HWOIxcJmsFFkOaegryLE74zosmYj9tbZIcQ5Z4ucMWk44rmreDC8oKYNUOye9gvYrN+u lN5WFBEhuX/6V0rAnbbFzQWjpWJQZPG8cOXVU2DV9NkF8YqI6/PfF3GWa1jnxjZXyLni fkcw== X-Gm-Message-State: ALyK8tLl0cq7Kv83FksXzso69ahYDlJnz/e+xzCx9fie5vAX8a9duUZF/uiDJ4UYlHUWUFXz X-Received: by 10.28.63.136 with SMTP id m130mr17289358wma.33.1466112508570; Thu, 16 Jun 2016 14:28:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:28 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Yoshinori Sato , uclinux-h8-devel@lists.sourceforge.jp (moderated list:H8/300 ARCHITECTURE) Subject: [PATCH V2 20/63] clocksource/drivers/h8300_tpu: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:39 +0200 Message-Id: <1466112442-31105-21-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 --- drivers/clocksource/h8300_timer8.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/h8300_timer8.c b/drivers/clocksource/h8300_timer8.c index c151941..0292a19 100644 --- a/drivers/clocksource/h8300_timer8.c +++ b/drivers/clocksource/h8300_timer8.c @@ -164,24 +164,26 @@ static struct timer8_priv timer8_priv = { }, }; -static void __init h8300_8timer_init(struct device_node *node) +static int __init h8300_8timer_init(struct device_node *node) { void __iomem *base; - int irq; + int irq, ret; struct clk *clk; clk = of_clk_get(node, 0); if (IS_ERR(clk)) { pr_err("failed to get clock for clockevent\n"); - return; + return PTR_ERR(clk); } + ret = ENXIO; base = of_iomap(node, 0); if (!base) { pr_err("failed to map registers for clockevent\n"); goto free_clk; } + ret = -EINVAL; irq = irq_of_parse_and_map(node, 0); if (!irq) { pr_err("failed to get irq for clockevent\n"); @@ -205,11 +207,12 @@ static void __init h8300_8timer_init(struct device_node *node) clockevents_config_and_register(&timer8_priv.ced, timer8_priv.rate, 1, 0x0000ffff); - return; + return 0; unmap_reg: iounmap(base); free_clk: clk_put(clk); + return ret; } -CLOCKSOURCE_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init); +CLOCKSOURCE_OF_DECLARE_RET(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init);