From patchwork Thu Jun 16 21:26:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70263 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp468501qgy; Thu, 16 Jun 2016 14:40:37 -0700 (PDT) X-Received: by 10.66.216.8 with SMTP id om8mr7596602pac.9.1466113237360; Thu, 16 Jun 2016 14:40:37 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 66si8020355pfs.29.2016.06.16.14.40.36; Thu, 16 Jun 2016 14:40:37 -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 S1755231AbcFPV2c (ORCPT + 30 others); Thu, 16 Jun 2016 17:28:32 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38138 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754940AbcFPV22 (ORCPT ); Thu, 16 Jun 2016 17:28:28 -0400 Received: by mail-wm0-f42.google.com with SMTP id m124so86955785wme.1 for ; Thu, 16 Jun 2016 14:28:28 -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=vGkFL9mInYpU29oeqJlV9y+Ksx6pEAj9qSWN1L52+gw=; b=ZvR+I4TMbWYbiGj24HEbJNvCO5hg/f1YnMnJ3+ddBMI9oxmzLveTaKsb/yeWZ3isnj PBpLPssJxXQN6ZJXHb47buDguFC1lDn/Lu79ud/8lVXQbV8DYfrfxr3VG0sTNytbjFXe wvmltdgewx/b0i20BfxjGmu10PLeW6gynnglM= 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=vGkFL9mInYpU29oeqJlV9y+Ksx6pEAj9qSWN1L52+gw=; b=AXESe96/6vQ1GeUHkD9Ba6t3SW2Iq2+THM6Pp05GdCLYw0CKROmn7ZZsBQvu/4ZGZ8 sh4qxc/P/jnDjMqpt73fAF9g9NN6Y2ztOUVJmrbbn9551rZrp7tgDkeAHgXteejXhNZW 0OJ3zbFwFUsTdyZH+S9GpGxrVauPk9GESQ4Qrp3nbjDF7NArlHbzPhKwsuh9Etik11Jk mg0bZQAkezcrOfeY/XU23PRfUsUBmALW6oop8UQqy0/fzD7tbhFosLHoXU3a/Lrlmpfs lO45C+YWjkiFDBpseKhs6VUTIcb+JmOp/e5WX9xoQmDkacWFyA3p7yMqYj+83g24UxGs vkMw== X-Gm-Message-State: ALyK8tJJaSC4IS2FxW4cmBHfFoDnXbV0w3RbsdcoJGQc3d4sdJBrayCKpObOpmNp2AybXvMR X-Received: by 10.28.4.140 with SMTP id 134mr17833017wme.91.1466112507319; Thu, 16 Jun 2016 14:28:27 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:26 -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 19/63] clocksource/drivers/h8300_timer16: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:38 +0200 Message-Id: <1466112442-31105-20-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_timer16.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/h8300_timer16.c b/drivers/clocksource/h8300_timer16.c index 75c4407..9d99fc8 100644 --- a/drivers/clocksource/h8300_timer16.c +++ b/drivers/clocksource/h8300_timer16.c @@ -126,7 +126,7 @@ static struct timer16_priv timer16_priv = { #define REG_CH 0 #define REG_COMM 1 -static void __init h8300_16timer_init(struct device_node *node) +static int __init h8300_16timer_init(struct device_node *node) { void __iomem *base[2]; int ret, irq; @@ -136,9 +136,10 @@ static void __init h8300_16timer_init(struct device_node *node) clk = of_clk_get(node, 0); if (IS_ERR(clk)) { pr_err("failed to get clock for clocksource\n"); - return; + return PTR_ERR(clk); } + ret = -ENXIO; base[REG_CH] = of_iomap(node, 0); if (!base[REG_CH]) { pr_err("failed to map registers for clocksource\n"); @@ -151,6 +152,7 @@ static void __init h8300_16timer_init(struct device_node *node) goto unmap_ch; } + ret = -EINVAL; irq = irq_of_parse_and_map(node, 0); if (!irq) { pr_err("failed to get irq for clockevent\n"); @@ -174,7 +176,7 @@ static void __init h8300_16timer_init(struct device_node *node) clocksource_register_hz(&timer16_priv.cs, clk_get_rate(clk) / 8); - return; + return 0; unmap_comm: iounmap(base[REG_COMM]); @@ -182,6 +184,8 @@ unmap_ch: iounmap(base[REG_CH]); free_clk: clk_put(clk); + return ret; } -CLOCKSOURCE_OF_DECLARE(h8300_16bit, "renesas,16bit-timer", h8300_16timer_init); +CLOCKSOURCE_OF_DECLARE_RET(h8300_16bit, "renesas,16bit-timer", + h8300_16timer_init);