From patchwork Thu Jul 7 08:01:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71525 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1273544qgy; Thu, 7 Jul 2016 01:08:28 -0700 (PDT) X-Received: by 10.67.23.197 with SMTP id ic5mr49613896pad.127.1467878908541; Thu, 07 Jul 2016 01:08:28 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s184si2888089pfb.261.2016.07.07.01.08.28; Thu, 07 Jul 2016 01:08:28 -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 S1030402AbcGGIEl (ORCPT + 30 others); Thu, 7 Jul 2016 04:04:41 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:35627 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030271AbcGGID5 (ORCPT ); Thu, 7 Jul 2016 04:03:57 -0400 Received: by mail-wm0-f52.google.com with SMTP id z126so138066252wme.0 for ; Thu, 07 Jul 2016 01:03:56 -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=81yeFHSYmEMEOomSdhkUeQibmaU3oSmEppNfds5/25w=; b=K9RFVkPY9Km/ZqSj8IsQzpszrATJZeU6JmU4KnSn2q15otti5XxLM+KiP3VHBaTRED LxjKfnNQ6SA9oVxGAKKH1CA1JV7Upn058zevlg8l6DaU22XaAe7hG0GSGY/mf2vYk1aW gpCIZJ2uxf/sNAUUpNgfyALqo/FFSpQEEjSSE= 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=81yeFHSYmEMEOomSdhkUeQibmaU3oSmEppNfds5/25w=; b=A6htfQoK5JLLKDrdROv06mLMvlMW680hj2LLhsyBEOo3ojHP6qSvviql060o+rJlv4 05eH6G8K8l97Ebrj7OgHv6NYVfaovQjCjoq6lAYo4HGyFuVX2IXAzOv4d9xmkfl/i7gE fAkRMn/Tigom5Luz1gyv8Et+DUt6sPjkrH8kw5fPws52rmpZyDmijFJ3ktFsyHQMzyMU 1Gfbicj8Ko2oGZbDwwEM320cdTdfOzid68JsMVHNn+FSqAZQS2vWxL/7zHgcgwzuRCL/ ThqZRI2Lxwh+wgFGO2kALu+bhBSv2kNHSMi0CotQLANedQnPGoK1dGriChfTdJk86AHG GDhw== X-Gm-Message-State: ALyK8tIkPvXQ4HV2+Or6iF70rw/WEZcYQQTh1Gaqv/ejtvBh1MWFk/sSZ0Ldy3UT6OAE3Mjb X-Received: by 10.28.223.215 with SMTP id w206mr24361100wmg.61.1467878635797; Thu, 07 Jul 2016 01:03:55 -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.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:55 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 58/93] clocksource/drivers/sun5i: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:31 +0200 Message-Id: <1467878526-1238-58-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/timer-sun5i.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 24c83f9..f0a3ffb 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -311,33 +311,42 @@ err_free: return ret; } -static void __init sun5i_timer_init(struct device_node *node) +static int __init sun5i_timer_init(struct device_node *node) { struct reset_control *rstc; void __iomem *timer_base; struct clk *clk; - int irq; + int irq, ret; timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); - if (IS_ERR(timer_base)) - panic("Can't map registers"); + if (IS_ERR(timer_base)) { + pr_err("Can't map registers"); + return PTR_ERR(timer_base);; + } irq = irq_of_parse_and_map(node, 0); - if (irq <= 0) - panic("Can't parse IRQ"); + if (irq <= 0) { + pr_err("Can't parse IRQ"); + return -EINVAL; + } clk = of_clk_get(node, 0); - if (IS_ERR(clk)) - panic("Can't get timer clock"); + if (IS_ERR(clk)) { + pr_err("Can't get timer clock"); + return PTR_ERR(clk); + } rstc = of_reset_control_get(node, NULL); if (!IS_ERR(rstc)) reset_control_deassert(rstc); - sun5i_setup_clocksource(node, timer_base, clk, irq); - sun5i_setup_clockevent(node, timer_base, clk, irq); + ret = sun5i_setup_clocksource(node, timer_base, clk, irq); + if (ret) + return ret; + + return sun5i_setup_clockevent(node, timer_base, clk, irq); } -CLOCKSOURCE_OF_DECLARE(sun5i_a13, "allwinner,sun5i-a13-hstimer", - sun5i_timer_init); -CLOCKSOURCE_OF_DECLARE(sun7i_a20, "allwinner,sun7i-a20-hstimer", - sun5i_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(sun5i_a13, "allwinner,sun5i-a13-hstimer", + sun5i_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(sun7i_a20, "allwinner,sun7i-a20-hstimer", + sun5i_timer_init);