From patchwork Tue Jun 28 10:30:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70996 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1509610qgy; Tue, 28 Jun 2016 03:34:20 -0700 (PDT) X-Received: by 10.66.193.231 with SMTP id hr7mr592329pac.28.1467110060892; Tue, 28 Jun 2016 03:34:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xa6si33033397pab.117.2016.06.28.03.34.20; Tue, 28 Jun 2016 03:34:20 -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 S1752866AbcF1Kd6 (ORCPT + 30 others); Tue, 28 Jun 2016 06:33:58 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:35635 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720AbcF1Kdd (ORCPT ); Tue, 28 Jun 2016 06:33:33 -0400 Received: by mail-wm0-f52.google.com with SMTP id v199so133586292wmv.0 for ; Tue, 28 Jun 2016 03:33:12 -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=HUl16XhL7C5WWVx3BZr3rJxQ2FGP/rfdMwyX8UF+8Gcku91EN9KiMtIMUjk6LS1bpP U1b6lH95w9ViKlPM8IB44ur8rWFj+v95XK/oHiKic9Qa+gVv0eeWOjpJbm1bHP0MhiDH 0i2jrZotwsFeT3c6D24IJ1Tza9IzFU3IY7kjQ= 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=mX0LMU1vvuFyvE8Al5FktANMxRSQUeQ6LJkKcy/Y0GdwJBIRMFD72wyXTF+92BAf8p NK6TucFUXjUKazbu6vGAZKxcG/xKdl3qEkZtt57/byp18FZy2BjPgPdkZPy7yEnMrzB7 NrIKXDCzP8/wFBSRnwBT5uUokjQslAL6ATqxByan5H4OU4ZVKC+yplIl6/uw3q0HT3sJ 5jiVPOyORKPRl2080tWqBsOR90mLrfvDf6NQ/RlkihQU96+chrDIv4gBE6uNT9mH4cO9 KM94vlfcm7lSvaPA0qSAiid0FPO7CbyegTyy9FuVWMKDequq/NbpJ4gGNevwVhO8oTQ/ 5Oyw== X-Gm-Message-State: ALyK8tJQZ+WVEmiNGo0scdv/HfEaYWMUsvFt8fluOjI2HUREkC7Z9rwO23/rvIYJfoizvmdi X-Received: by 10.28.29.146 with SMTP id d140mr2907215wmd.27.1467109991193; Tue, 28 Jun 2016 03:33:11 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:10 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH 16/92] clocksource/drivers/asm9260: Convert init function to return error Date: Tue, 28 Jun 2016 12:30:35 +0200 Message-Id: <1467109911-11060-16-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/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);