From patchwork Thu Jul 7 08:00: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: 71565 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1288491qgy; Thu, 7 Jul 2016 01:50:52 -0700 (PDT) X-Received: by 10.66.144.97 with SMTP id sl1mr49870134pab.47.1467881140671; Thu, 07 Jul 2016 01:45:40 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ix8si3217535pac.124.2016.07.07.01.45.40; Thu, 07 Jul 2016 01:45:40 -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 S1756990AbcGGIpf (ORCPT + 30 others); Thu, 7 Jul 2016 04:45:35 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37203 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933293AbcGGICw (ORCPT ); Thu, 7 Jul 2016 04:02:52 -0400 Received: by mail-wm0-f50.google.com with SMTP id a66so21382555wme.0 for ; Thu, 07 Jul 2016 01:02:51 -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=ZKRX+3H/5et+dCIMrSsT6yf2NNyT87YpUIjsdbJyHyIiadlCPYWHGMs2U6o40lJL7x Uk2vZVUCGF252Q+XKGEKb7Q0htOC7GpRcMI0iQ/BMXdgvVy1EUyRvkI4nyK+BHZ/ELYj ur0AhNi7fSvltMMqetrVo4KynHWfAm4tJOS3E= 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=NPNhztF8OWWJJUYfTPTRbh0Nfj6Pl/NFhqqjO0wFmtekOYkHkIciqCZJrs3RiB1wHM IAO5avcckNfOXgR1HGC/LF1x03IPeFHbOR7TgQhKRIQ/3PLUdsranh4q4KLuGcG4tWgB DM/d9b5T1ZJIRQ/eBnkcqXDZoRfk165glRJHx4qYIHP/3OxGOB4B+c4z/A4u5z8sWUJH n8ExIAanU6J4mpmuxkvb18BKvMkHtR4sxuXrZCbCFh11hDmVo8UYrkuP+jImIrKjpfzO muxOjQMGoSsh9o3dBxvxIsU9euVMq+x7ZouC21rB/013jFV6jgEBeXEacN31qAlCjIDM IuKg== X-Gm-Message-State: ALyK8tKMtLC2fih+8UQnFJnPdq4Xb8CoclMseFbSSh6GNRR/iFmFwfyy141u6XMeYJcYREiV X-Received: by 10.28.199.139 with SMTP id x133mr23515279wmf.45.1467878570956; Thu, 07 Jul 2016 01:02:50 -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.02.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:02:50 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 16/93] clocksource/drivers/asm9260: Convert init function to return error Date: Thu, 7 Jul 2016 10:00:49 +0200 Message-Id: <1467878526-1238-16-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/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);