From patchwork Wed Jun 1 08:34:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 68998 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2410190qge; Wed, 1 Jun 2016 01:59:14 -0700 (PDT) X-Received: by 10.98.22.141 with SMTP id 135mr6422475pfw.116.1464771545848; Wed, 01 Jun 2016 01:59:05 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i73si49829907pfa.222.2016.06.01.01.59.05; Wed, 01 Jun 2016 01:59:05 -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 S1757903AbcFAI6m (ORCPT + 30 others); Wed, 1 Jun 2016 04:58:42 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:35700 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757745AbcFAIfk (ORCPT ); Wed, 1 Jun 2016 04:35:40 -0400 Received: by mail-wm0-f44.google.com with SMTP id a136so169899316wme.0 for ; Wed, 01 Jun 2016 01:35:40 -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=cEi0GuFPYgDVlkkVEu4TVvfr/ZGeiwgaYWEuZjeqhtA=; b=B73YP3wwZbfCeucP7PX1AFZQD0+Hm1rnlEUmIE+PhlK8brrW0tUzlW0xk+1xtbiJnA KedkzF2rWnlLa6wV/JXHz7KGaoBQbzSsbNwUbrhlhSXhQmLryQOG6nqMijWCkpgVvWWx OSgXPgiBZFHgMm6IIyvoWEqgc4Idne3VA+1AI= 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=cEi0GuFPYgDVlkkVEu4TVvfr/ZGeiwgaYWEuZjeqhtA=; b=gaGlAC8BwOmbBRG1GOSF07zijaqJGrh/pRJc6Uvty5xvYHKLBYvg+nEkJ8czamn1O/ twEcr72MHrrT/xdGCoZUXHpsGHG8Fh1QsWzhxOotlsyQSE4kj4l+OG5+IsCquMZUn0/W pMltAZxDxXZP6qMAqmSqa3cslOMXCuXvT0E4uGjjCTTNQf9RV7o+jk4wDFpqir1JZmLD kIlJvvyGWo1RfHt813+WUm5dQxheiokWFq9XlM2Td9dVO+MxmseoCVt4dKzLzYFxBstp x2Fe47dO9jARtrwz5/1oTWU44gAg3c26PQVrwmAJ6rBy4tRId0lIQiZaSMCocpnRrIn1 0ACw== X-Gm-Message-State: ALyK8tJHt8X2Kj130sRJH8tQ0c/KhjtjIHWdJwykHA0Fw13KsVUcXkpftsQOYNgoggOl/vAG X-Received: by 10.194.9.233 with SMTP id d9mr2612951wjb.29.1464770139379; Wed, 01 Jun 2016 01:35:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 01:35:38 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH 6/9] clocksource/drivers/asm9260: Convert init function to return error Date: Wed, 1 Jun 2016 10:34:49 +0200 Message-Id: <1464770093-12667-7-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> 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/asm9260_timer.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/asm9260_timer.c b/drivers/clocksource/asm9260_timer.c index 217438d..d113c02 100644 --- a/drivers/clocksource/asm9260_timer.c +++ b/drivers/clocksource/asm9260_timer.c @@ -184,7 +184,7 @@ static irqreturn_t asm9260_timer_interrupt(int irq, void *dev_id) * Timer initialization * --------------------------------------------------------------------------- */ -static void __init asm9260_timer_init(struct device_node *np) +static int __init asm9260_timer_init(struct device_node *np) { int irq; struct clk *clk; @@ -192,20 +192,26 @@ static void __init asm9260_timer_init(struct device_node *np) unsigned long rate; priv.base = of_io_request_and_map(np, 0, np->name); - if (IS_ERR(priv.base)) - panic("%s: unable to map resource", np->name); + if (IS_ERR(priv.base)) { + pr_err("%s: unable to map resource", np->name); + return PTR_ERR(priv.base); + } clk = of_clk_get(np, 0); ret = clk_prepare_enable(clk); - if (ret) - panic("Failed to enable clk!\n"); + if (ret) { + pr_err("Failed to enable clk!\n"); + return ret; + } irq = irq_of_parse_and_map(np, 0); ret = request_irq(irq, asm9260_timer_interrupt, IRQF_TIMER, DRIVER_NAME, &event_dev); - if (ret) - panic("Failed to setup irq!\n"); + if (ret) { + pr_err("Failed to setup irq!\n"); + return ret; + } /* set all timers for count-up */ writel_relaxed(BM_DIR_DEFAULT, priv.base + HW_DIR); @@ -229,6 +235,8 @@ static void __init asm9260_timer_init(struct device_node *np) priv.ticks_per_jiffy = DIV_ROUND_CLOSEST(rate, HZ); event_dev.cpumask = cpumask_of(0); clockevents_config_and_register(&event_dev, rate, 0x2c00, 0xfffffffe); + + return 0; } -CLOCKSOURCE_OF_DECLARE(asm9260_timer, "alphascale,asm9260-timer", +CLOCKSOURCE_OF_DECLARE_RET(asm9260_timer, "alphascale,asm9260-timer", asm9260_timer_init);