From patchwork Thu Jun 16 21:26:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70215 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp464637qgy; Thu, 16 Jun 2016 14:29:14 -0700 (PDT) X-Received: by 10.98.68.203 with SMTP id m72mr7433751pfi.135.1466112554181; Thu, 16 Jun 2016 14:29:14 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l17si7967338pfa.42.2016.06.16.14.29.13; Thu, 16 Jun 2016 14:29:14 -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 S1755251AbcFPV2i (ORCPT + 30 others); Thu, 16 Jun 2016 17:28:38 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35870 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932122AbcFPV2f (ORCPT ); Thu, 16 Jun 2016 17:28:35 -0400 Received: by mail-wm0-f51.google.com with SMTP id f126so66405898wma.1 for ; Thu, 16 Jun 2016 14:28:34 -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=3l8xPvPMs/zn6dk1HDAkqB0lPKv7NqxCYAYN3xAOhFQ=; b=N4rPqrHLp+EQ31cIK8oIeXBJHd6xEd5UdV/B/D1VnHpmPkKTdCRyhv39lwI61rZmBg wPPJRYWNJ9DZCDQkrEdAaEuVrdO4D456MzXJpEkSHjQs2ZnowUx2WmcGL7/l9ddPLBk/ QoUrirRJO00ZJppioxAFI+hiW9shhaZuv5yRo= 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=3l8xPvPMs/zn6dk1HDAkqB0lPKv7NqxCYAYN3xAOhFQ=; b=k4XZBHzOn8O0YYEdb37/fQVdL1xqhPrw+fNQj0oTbhVM1GF/Mao8tdHM3LWmdIejIA HTzoYF3b5qFS1yyZ4B24MJYhb673Rey0XGmOUSRKDgAPr2ezFApqQR2GiXJByw3u0ftI YMTfPl21ofzIBcMmsK349Be0uSKzDYRr5zNx6ni3s9i4soMPdYHbFyX807AaY43Fc3zw w1Z+XSeUVbD8xBk+wyLDzJ8Av+NpWuN6QIqKxIEpRjEjQEdbpRU2v+e7iYy3ovYt+wIE 9fESypLQYEkhSIA9kPEP0JJ6c0KIPBFI6285hiVp9g9Bt200EJFLtRtP/ir7QcHur10w JyNA== X-Gm-Message-State: ALyK8tLVPNuNsLDVJMl3+CJssSa5zwwHbcvFpNSY/q5XcLmYWiDVX6M/xnIsH7KRx7D9NZeu X-Received: by 10.194.82.161 with SMTP id j1mr1576770wjy.65.1466112513789; Thu, 16 Jun 2016 14:28:33 -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.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:33 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 24/63] clocksource/drivers/mps2-timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:43 +0200 Message-Id: <1466112442-31105-25-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/moxart_timer.c | 41 +++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/moxart_timer.c b/drivers/clocksource/moxart_timer.c index 19857af..b9c30cd 100644 --- a/drivers/clocksource/moxart_timer.c +++ b/drivers/clocksource/moxart_timer.c @@ -119,34 +119,45 @@ static struct irqaction moxart_timer_irq = { .dev_id = &moxart_clockevent, }; -static void __init moxart_timer_init(struct device_node *node) +static int __init moxart_timer_init(struct device_node *node) { int ret, irq; unsigned long pclk; struct clk *clk; base = of_iomap(node, 0); - if (!base) - panic("%s: of_iomap failed\n", node->full_name); + if (!base) { + pr_err("%s: of_iomap failed\n", node->full_name); + return -ENXIO; + } irq = irq_of_parse_and_map(node, 0); - if (irq <= 0) - panic("%s: irq_of_parse_and_map failed\n", node->full_name); + if (irq <= 0) { + pr_err("%s: irq_of_parse_and_map failed\n", node->full_name); + return -EINVAL; + } ret = setup_irq(irq, &moxart_timer_irq); - if (ret) - panic("%s: setup_irq failed\n", node->full_name); + if (ret) { + pr_err("%s: setup_irq failed\n", node->full_name); + return ret; + } clk = of_clk_get(node, 0); - if (IS_ERR(clk)) - panic("%s: of_clk_get failed\n", node->full_name); + if (IS_ERR(clk)) { + pr_err("%s: of_clk_get failed\n", node->full_name); + return PTR_ERR(clk); + } pclk = clk_get_rate(clk); - if (clocksource_mmio_init(base + TIMER2_BASE + REG_COUNT, - "moxart_timer", pclk, 200, 32, - clocksource_mmio_readl_down)) - panic("%s: clocksource_mmio_init failed\n", node->full_name); + ret = clocksource_mmio_init(base + TIMER2_BASE + REG_COUNT, + "moxart_timer", pclk, 200, 32, + clocksource_mmio_readl_down); + if (ret) { + pr_err("%s: clocksource_mmio_init failed\n", node->full_name); + return ret; + } clock_count_per_tick = DIV_ROUND_CLOSEST(pclk, HZ); @@ -164,5 +175,7 @@ static void __init moxart_timer_init(struct device_node *node) */ clockevents_config_and_register(&moxart_clockevent, pclk, 0x4, 0xfffffffe); + + return 0; } -CLOCKSOURCE_OF_DECLARE(moxart, "moxa,moxart-timer", moxart_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(moxart, "moxa,moxart-timer", moxart_timer_init);