From patchwork Wed Jun 1 08:34:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 68986 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2402797qge; Wed, 1 Jun 2016 01:37:18 -0700 (PDT) X-Received: by 10.98.80.134 with SMTP id g6mr6219039pfj.87.1464770238085; Wed, 01 Jun 2016 01:37:18 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id qe1si8418928pac.120.2016.06.01.01.37.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 01:37:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b81dA-0004Ad-UY; Wed, 01 Jun 2016 08:36:00 +0000 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b81d6-0003iQ-PY for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2016 08:35:57 +0000 Received: by mail-wm0-x232.google.com with SMTP id n184so19432874wmn.1 for ; Wed, 01 Jun 2016 01:35:36 -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=tcHHeb4h3AyqMN6BUhTKfzxL6/W40TZFpedlfDWvNSQ=; b=dgQhQyzE09bIAlektNp7bZ8qTOqsnmyebLz0AgGFfmtMkv0u3kN26ueyQh2Cfi319P hfCY4+z14/jSqpPUpnnhGWm7JoROul8qgm6wJIOapXeqe8pawAAY9L8RTYTYkgZAvsDm 392bzc+LTIvnMXzQi0CZymQ3xwrYi49EURht0= 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=tcHHeb4h3AyqMN6BUhTKfzxL6/W40TZFpedlfDWvNSQ=; b=PSCDg200hIonW8HJ02qUTeymPp/NengYJVfqpuMGLkp8LiwMzhfKDrzUYDPxrnpECQ SsvYFvFXPf/eeW++EEFR36MPA3D4V0QrU4sii44et0zarj76LcRPVv31yDq4N3MTx5ZI 8OHPBhB+YCeb1EEcWJYMRxXpU4Bfbk/mX/VxlSfmuMlVvJYNkEtLEMBimU1KGn9xGkdS Hto4Frox36nSfNuiNttmxn1jndoWfOdKoPPT52GGUOwNMAk9/Kk3MgMsJ5z2BTzp3oXF gvvfiFIlcyBTvNhYtkyFPia6LRvcnJ6QDCS7vqk17UbdG3hZtRuY0Ds+mLVkEKvzyKAO Trtw== X-Gm-Message-State: ALyK8tIya50z1S1YMoLbgUvKTSA7mbPn2n7e8OGpFomNJlVx/ifWmzORcC+Zhy4dpE3d5s5/ X-Received: by 10.194.206.39 with SMTP id ll7mr2209983wjc.179.1464770135369; Wed, 01 Jun 2016 01:35:35 -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 t3sm33542865wmf.20.2016.06.01.01.35.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 01:35:34 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH 3/9] clocksource/drivers/rockchip_timer: Convert init function to return error Date: Wed, 1 Jun 2016 10:34:46 +0200 Message-Id: <1464770093-12667-4-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464770093-12667-1-git-send-email-daniel.lezcano@linaro.org> References: <1464770093-12667-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160601_013557_056247_52B07C30 X-CRM114-Status: GOOD ( 14.97 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:232 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:ARM/Rockchip SoC..." , linux-kernel@vger.kernel.org, "moderated list:ARM/Rockchip SoC..." , Heiko Stuebner MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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/rockchip_timer.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/clocksource/rockchip_timer.c b/drivers/clocksource/rockchip_timer.c index b991b28..36b0209 100644 --- a/drivers/clocksource/rockchip_timer.c +++ b/drivers/clocksource/rockchip_timer.c @@ -106,17 +106,17 @@ static irqreturn_t rk_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static void __init rk_timer_init(struct device_node *np) +static int __init rk_timer_init(struct device_node *np) { struct clock_event_device *ce = &bc_timer.ce; struct clk *timer_clk; struct clk *pclk; - int ret, irq; + int ret = -EINVAL, irq; bc_timer.base = of_iomap(np, 0); if (!bc_timer.base) { pr_err("Failed to get base address for '%s'\n", TIMER_NAME); - return; + return -ENXIO; } pclk = of_clk_get_by_name(np, "pclk"); @@ -169,7 +169,7 @@ static void __init rk_timer_init(struct device_node *np) clockevents_config_and_register(ce, bc_timer.freq, 1, UINT_MAX); - return; + return 0; out_irq: clk_disable_unprepare(timer_clk); @@ -177,6 +177,8 @@ out_timer_clk: clk_disable_unprepare(pclk); out_unmap: iounmap(bc_timer.base); + + return ret; } -CLOCKSOURCE_OF_DECLARE(rk_timer, "rockchip,rk3288-timer", rk_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(rk_timer, "rockchip,rk3288-timer", rk_timer_init);