From patchwork Thu Jun 16 21:26:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70258 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp467708qgy; Thu, 16 Jun 2016 14:38:13 -0700 (PDT) X-Received: by 10.98.88.5 with SMTP id m5mr7482968pfb.27.1466113093424; Thu, 16 Jun 2016 14:38:13 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fn4si7812548pac.157.2016.06.16.14.38.13; Thu, 16 Jun 2016 14:38:13 -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 S932275AbcFPViK (ORCPT + 30 others); Thu, 16 Jun 2016 17:38:10 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36977 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754811AbcFPV2p (ORCPT ); Thu, 16 Jun 2016 17:28:45 -0400 Received: by mail-wm0-f41.google.com with SMTP id a66so75547961wme.0 for ; Thu, 16 Jun 2016 14:28:45 -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=o+3CStwOQbIdpQq6dcnk5GmSV6S+bAEt6Aaeqbiqrxs=; b=ixBAPBJn1rO1ctJ1Y1Jjqk4Bp5KSwQzDTSSLo/VeCxvMK0gN3XAwk4svs0QNsaWHuk rq7EXmI1gohNhhiVRLb+YZhzbzfBlwvEYGQGi6kUuiogWLyKCIP7/0p9yD0Mr1mldwPw I01GsFMJQJeY+bYg1q0z626pGqdoPRi5njTiI= 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=o+3CStwOQbIdpQq6dcnk5GmSV6S+bAEt6Aaeqbiqrxs=; b=ln+1KTJOdjq+MamKX4VrsdYk3zlje71Jd71LRZevS2G7HHQKkGNbYQpWwoul888FuC fF/kaJFW772UvCSPrAubXKXYGE/zLCEq432ch1r+yGBuARtpybqBusMCAPhzxv7XyrQY gI3pbEac1tU8WGHck/7FGBeDyfVp1g7sItYzKk9DMjsbgH6i1f/couE84Ki30wa5tayv n68Q8zd2394s0VpUu4Rpe4ZllhHB1hR6awK3Knj/f06eLWsLzRUuuvnioCynGHne0ONc WVRDYtjRSViF4IuOjglY/+r91ahlCH/oO7bfQ2ELFhAebjMHawyBI0Wi1KE7/ZloYnda +VVA== X-Gm-Message-State: ALyK8tJxY+kAFEPofUnbja2GKjT2HsqNgv5iifkkDpgQK8CbkSLqP81UVB6aQW669uyGJ+Yk X-Received: by 10.194.141.238 with SMTP id rr14mr1454261wjb.58.1466112524535; Thu, 16 Jun 2016 14:28:44 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:43 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 32/63] clocksource/drivers/tegra20_timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:51 +0200 Message-Id: <1466112442-31105-33-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/tango_xtal.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/tango_xtal.c b/drivers/clocksource/tango_xtal.c index c407c47..7dc716c 100644 --- a/drivers/clocksource/tango_xtal.c +++ b/drivers/clocksource/tango_xtal.c @@ -19,7 +19,7 @@ static u64 notrace read_sched_clock(void) return read_xtal_counter(); } -static void __init tango_clocksource_init(struct device_node *np) +static int __init tango_clocksource_init(struct device_node *np) { struct clk *clk; int xtal_freq, ret; @@ -27,13 +27,13 @@ static void __init tango_clocksource_init(struct device_node *np) xtal_in_cnt = of_iomap(np, 0); if (xtal_in_cnt == NULL) { pr_err("%s: invalid address\n", np->full_name); - return; + return -ENXIO; } clk = of_clk_get(np, 0); if (IS_ERR(clk)) { pr_err("%s: invalid clock\n", np->full_name); - return; + return PTR_ERR(clk); } xtal_freq = clk_get_rate(clk); @@ -44,11 +44,13 @@ static void __init tango_clocksource_init(struct device_node *np) 32, clocksource_mmio_readl_up); if (ret) { pr_err("%s: registration failed\n", np->full_name); - return; + return ret; } sched_clock_register(read_sched_clock, 32, xtal_freq); register_current_timer_delay(&delay_timer); + + return 0; } -CLOCKSOURCE_OF_DECLARE(tango, "sigma,tick-counter", tango_clocksource_init); +CLOCKSOURCE_OF_DECLARE_RET(tango, "sigma,tick-counter", tango_clocksource_init);