From patchwork Thu Jun 16 21:26:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70212 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp464404qgy; Thu, 16 Jun 2016 14:28:38 -0700 (PDT) X-Received: by 10.36.64.14 with SMTP id n14mr27089021ita.53.1466112514575; Thu, 16 Jun 2016 14:28:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u4si20618946pal.94.2016.06.16.14.28.34; Thu, 16 Jun 2016 14:28:34 -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 S1755174AbcFPV2U (ORCPT + 30 others); Thu, 16 Jun 2016 17:28:20 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38049 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755157AbcFPV2Q (ORCPT ); Thu, 16 Jun 2016 17:28:16 -0400 Received: by mail-wm0-f53.google.com with SMTP id m124so86950566wme.1 for ; Thu, 16 Jun 2016 14:28:16 -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=tu5snzaeNLSkp0bzUza9qm7gtPUhz2aVaXANv8dCu/8=; b=BOyEIaDRjoyfL5MVtwRDCbGoHjMSoCNGjk4ahXzf11blDx6wwCSR49rm3Qoy/0qte8 VHNI+7boMa6XM44+yyuYBaHDF39MMK7iXMqXRTxuJt2vOs8IkGKE450OENpQplRuUWls RcPEqlITfA/1BuWZJgjoCfstSfDV/WU4o+Xaw= 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=tu5snzaeNLSkp0bzUza9qm7gtPUhz2aVaXANv8dCu/8=; b=KTSaPfpYP9fSMen6HKekMDYuwhQUT5eqEwf0FlVLe0mmAI/d2/GSgCFMAxetQyINHx 14PaVkx5+8oIu+diQMJ8OO4SaNhwlgisYAiU+uizDNSWYEkuwFnfSsBnV7qc+0fZ5j/U AliwwFLZPi7JuQbobgUVPP9282NzqmympwV/iZ8wAVtt8Yu96f6h0+ljH3986dWli1v3 gn58eKrAZnBAhmVFIqgncJUXEkLvp8wTrrFWJT4V7s7F7HsyZy72MZ9cqemjMtBYSGXb 9NdtxeiwnhS76AaqPIMxCuXCztCrxz0hN3zJbjHrSt1ku407YFvaGfKvrroC4UNvEjO6 S8Qg== X-Gm-Message-State: ALyK8tJEQjfc33i4G2hYBZeJvbGuGIuNQZF9XbfeFhFfzRx7dIZlHuquwu/oHoCsncJm0Ytn X-Received: by 10.194.234.71 with SMTP id uc7mr1660691wjc.80.1466112495415; Thu, 16 Jun 2016 14:28:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:14 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Baruch Siach , linux-arm-kernel@lists.infradead.org (moderated list:ARM/CONEXANT DIGI...) Subject: [PATCH V2 11/63] clocksource/drivers/digitcolor: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:30 +0200 Message-Id: <1466112442-31105-12-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/timer-digicolor.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-digicolor.c b/drivers/clocksource/timer-digicolor.c index 96bb222..b929061 100644 --- a/drivers/clocksource/timer-digicolor.c +++ b/drivers/clocksource/timer-digicolor.c @@ -148,7 +148,7 @@ static u64 notrace digicolor_timer_sched_read(void) return ~readl(dc_timer_dev.base + COUNT(TIMER_B)); } -static void __init digicolor_timer_init(struct device_node *node) +static int __init digicolor_timer_init(struct device_node *node) { unsigned long rate; struct clk *clk; @@ -161,19 +161,19 @@ static void __init digicolor_timer_init(struct device_node *node) dc_timer_dev.base = of_iomap(node, 0); if (!dc_timer_dev.base) { pr_err("Can't map registers"); - return; + return -ENXIO; } irq = irq_of_parse_and_map(node, dc_timer_dev.timer_id); if (irq <= 0) { pr_err("Can't parse IRQ"); - return; + return -EINVAL; } clk = of_clk_get(node, 0); if (IS_ERR(clk)) { pr_err("Can't get timer clock"); - return; + return PTR_ERR(clk); } clk_prepare_enable(clk); rate = clk_get_rate(clk); @@ -190,13 +190,17 @@ static void __init digicolor_timer_init(struct device_node *node) ret = request_irq(irq, digicolor_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL, "digicolor_timerC", &dc_timer_dev.ce); - if (ret) + if (ret) { pr_warn("request of timer irq %d failed (%d)\n", irq, ret); + return ret; + } dc_timer_dev.ce.cpumask = cpu_possible_mask; dc_timer_dev.ce.irq = irq; clockevents_config_and_register(&dc_timer_dev.ce, rate, 0, 0xffffffff); + + return 0; } -CLOCKSOURCE_OF_DECLARE(conexant_digicolor, "cnxt,cx92755-timer", +CLOCKSOURCE_OF_DECLARE_RET(conexant_digicolor, "cnxt,cx92755-timer", digicolor_timer_init);