From patchwork Thu Jul 7 08:01:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71562 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1282646qgy; Thu, 7 Jul 2016 01:33:14 -0700 (PDT) X-Received: by 10.98.152.210 with SMTP id d79mr3173289pfk.2.1467880394030; Thu, 07 Jul 2016 01:33:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x5si3089400pac.165.2016.07.07.01.33.13; Thu, 07 Jul 2016 01:33:14 -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 S1030534AbcGGIdK (ORCPT + 30 others); Thu, 7 Jul 2016 04:33:10 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35124 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933363AbcGGIDQ (ORCPT ); Thu, 7 Jul 2016 04:03:16 -0400 Received: by mail-wm0-f51.google.com with SMTP id z126so138044174wme.0 for ; Thu, 07 Jul 2016 01:03:16 -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=i6lTcj2uzV2FT4vnIn3myhrn75rg4UXtzFvDkKom8kaS3R/wulk1pFKLEu3ShU5vpo yVSgkCiP4VwZ/q4gVbHLcn6AlQDZQnq2jD8R8/iAyKsr6frIXd2dP6p6Y+Y7Asgzg75x uAhNEYY2qoN7vGS7TdFRGvAlYCXk4dBRLfZvc= 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=ZlG44xL7hBKt14KeqXn382DoWcaVTZ4PpLhS7BSBVAB2BDUYmB94nhFcYmF6pKsXvd s5DHahr5V6Sle+xpR78pN/ca4pQo8yGz8Jp/KskNYYbem5vAqpXsFfbrNnCBN08Q1uj5 Gd8Jz28Cy+NNNqIoLOOIHcfEQbReEFdEP0d8d75DfgTZO34kEWWpygsu1/76bqPJFOnT vrALUSI8SjAJGIJ4lmvohQadEbDs4zYjjIYx6ndaBmYxEBVudgDar9+ISRTIJUvaCmW9 lK84L66sv6OFO/jVsPXWG8IyK1HT5abZtp943n7HTcAS06NUzAmjdVWUSTXydMckAi4R q35A== X-Gm-Message-State: ALyK8tKmhnS29dr+KOje3V6Wg+jIHu5HA981QDVfogcyCmnDn1CAtOsE+6dy+2VT4otrrVQT X-Received: by 10.194.114.42 with SMTP id jd10mr23722271wjb.88.1467878595520; Thu, 07 Jul 2016 01:03:15 -0700 (PDT) Received: from localhost.localdomain (lft31-1-88-121-166-205.fbx.proxad.net. [88.121.166.205]) by smtp.gmail.com with ESMTPSA id v70sm51327wmf.18.2016.07.07.01.03.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:15 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp Subject: [PATCH 29/93] clocksource/drivers/h8300_timer16: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:02 +0200 Message-Id: <1467878526-1238-29-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> References: <577E0BED.3020608@linaro.org> <1467878526-1238-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);