From patchwork Tue Jun 28 10:30:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71049 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1516050qgy; Tue, 28 Jun 2016 03:52:02 -0700 (PDT) X-Received: by 10.66.248.3 with SMTP id yi3mr606642pac.61.1467111121994; Tue, 28 Jun 2016 03:52:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x5si33144440pac.165.2016.06.28.03.52.01; Tue, 28 Jun 2016 03:52: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 S932256AbcF1Kv4 (ORCPT + 30 others); Tue, 28 Jun 2016 06:51:56 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38830 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752744AbcF1Kdd (ORCPT ); Tue, 28 Jun 2016 06:33:33 -0400 Received: by mail-wm0-f51.google.com with SMTP id r201so20900188wme.1 for ; Tue, 28 Jun 2016 03:33: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=6SVzV1d1cH/ei+mX1otd3tc01omCYuNk5RWEg7B3G0s=; b=Ai+govRNxAwUzN9/Q6EZwVDuwGS1HcvQIKwXLqXE/gLT1BFQ5dEtvn57EsY3OwzfnT cSKJaL8kGk6zLdhLk24R8sdbhs5U3tmAxE57OYqSCzGzFt7hXI8DCVJIm2kBsA74atCU 6dYYeNpb5urmYvAAM1mgqeixs5LF9CRyJ+yA8= 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=6SVzV1d1cH/ei+mX1otd3tc01omCYuNk5RWEg7B3G0s=; b=RnPl3UizXFKloL12sNY5d4X9gzejcwamDONP9vfCSxzdCzA/GaOEJJJzA8AYCwwZe4 4RwctnQ3JzQV9N/oeimwox60S5qxhOTl2mZubxMf3/p9QjZss8JWPCzn0mvPWLy9lbAh Foabr00j+h4TCISCBkEg4YF7Cfmbpo6nz3mkuEW6zjNwdqo5m+RTT5dimAEOmNNPmVfG 073k9mNtopa83RWY67dysd8uWgHeXI92Pse6R0XinlATDvNqEatFvbSJ3mKR/6ISC807 Gd8ovPXXQDI7ltjowLlEnGorxQ1RBfvPgnP934WzhzKIaqlAmAuARdYSMUHSyI+pBDmX AbQg== X-Gm-Message-State: ALyK8tKZ4Mum5lamiDG+wjdc+v8lHNDTc5McQ48kfdnGPzOAh2OntjPZIQtBQN51wiJDKuf6 X-Received: by 10.194.81.166 with SMTP id b6mr2523585wjy.81.1467110011385; Tue, 28 Jun 2016 03:33:31 -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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:30 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp Subject: [PATCH 31/92] clocksource/drivers/h8300_tpu: Convert init function to return error Date: Tue, 28 Jun 2016 12:30:50 +0200 Message-Id: <1467109911-11060-31-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 --- drivers/clocksource/h8300_tpu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/h8300_tpu.c b/drivers/clocksource/h8300_tpu.c index d4c1a28..4faf718 100644 --- a/drivers/clocksource/h8300_tpu.c +++ b/drivers/clocksource/h8300_tpu.c @@ -119,15 +119,16 @@ static struct tpu_priv tpu_priv = { #define CH_L 0 #define CH_H 1 -static void __init h8300_tpu_init(struct device_node *node) +static int __init h8300_tpu_init(struct device_node *node) { void __iomem *base[2]; struct clk *clk; + int ret = -ENXIO; clk = of_clk_get(node, 0); if (IS_ERR(clk)) { pr_err("failed to get clock for clocksource\n"); - return; + return PTR_ERR(clk); } base[CH_L] = of_iomap(node, CH_L); @@ -144,14 +145,13 @@ static void __init h8300_tpu_init(struct device_node *node) tpu_priv.mapbase1 = base[CH_L]; tpu_priv.mapbase2 = base[CH_H]; - clocksource_register_hz(&tpu_priv.cs, clk_get_rate(clk) / 64); - - return; + return clocksource_register_hz(&tpu_priv.cs, clk_get_rate(clk) / 64); unmap_L: iounmap(base[CH_H]); free_clk: clk_put(clk); + return ret; } -CLOCKSOURCE_OF_DECLARE(h8300_tpu, "renesas,tpu", h8300_tpu_init); +CLOCKSOURCE_OF_DECLARE_RET(h8300_tpu, "renesas,tpu", h8300_tpu_init);