From patchwork Thu Jun 16 21:26: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: 70262 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp468207qgy; Thu, 16 Jun 2016 14:39:41 -0700 (PDT) X-Received: by 10.98.69.81 with SMTP id s78mr7585040pfa.63.1466113181484; Thu, 16 Jun 2016 14:39:41 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a195si8013002pfa.80.2016.06.16.14.39.41; Thu, 16 Jun 2016 14:39:41 -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 S1755345AbcFPVjC (ORCPT + 30 others); Thu, 16 Jun 2016 17:39:02 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:35050 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754854AbcFPV2k (ORCPT ); Thu, 16 Jun 2016 17:28:40 -0400 Received: by mail-wm0-f42.google.com with SMTP id v199so207649218wmv.0 for ; Thu, 16 Jun 2016 14:28:35 -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=LuFStehQ0TIp8AFIrmwXuOENENGgDvOaqibnGw4RkyE=; b=Edpq2FIselwqj8FZj87v6tSFfsTnnwIrSKDQ+D8vXjvxeIVbEjaSJM5Xg4YBYevOoZ 2FbzfKrXrGGbJgp3RXchVRRe6e5dkobOs2n07QzX9aB3PHreriQjCM0yP7LLlCVmeNza vtBhGYcb0xSWy/3vyUyFaZH6JBhjeXM2aT0fI= 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=LuFStehQ0TIp8AFIrmwXuOENENGgDvOaqibnGw4RkyE=; b=dBSXpdMfXdz1VuUOlAY0hWCQgYLjjpjuYndFc0ZbxjsiqA3NgFMKt0jPxQ1n4Dyu4I x05PDOE1gtU1C55faf/b+HQTVsBHRMPhiLFomRdhHklBjRjhu6CN56muHvvRHu1kKqOI CX8e5whkSxU6MsSF9jE9rD7CJDufQIuH+Thp6htTQ7olMA3ax17ie51zl1er1YKBrPYe 8Sd/YQT5yW5o17/aBImVW02S7AUoMo0LuLrIYMLINghrXhlpeLAxmTaqYJZ+yIPKBPiW PfN78torB6KU3cDLNb3xgMrAYzROg1Ys7yo6Zoo0MLQQuKc1jdId+G/3viyeEdzlwwLp 0B1g== X-Gm-Message-State: ALyK8tImYS1oJ+y7ZX2ITGgadY9Mi3d3wxYOy7scUOChC63Msa84ROnQh63GyeVHnmsG0KXD X-Received: by 10.28.217.146 with SMTP id q140mr18181297wmg.56.1466112503432; Thu, 16 Jun 2016 14:28:23 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:22 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 16/63] clocksource/drivers/fsl_ftm_timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:35 +0200 Message-Id: <1466112442-31105-17-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/fsl_ftm_timer.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/fsl_ftm_timer.c b/drivers/clocksource/fsl_ftm_timer.c index 517e1c7..9ad4ca3 100644 --- a/drivers/clocksource/fsl_ftm_timer.c +++ b/drivers/clocksource/fsl_ftm_timer.c @@ -316,15 +316,16 @@ static int __init ftm_calc_closest_round_cyc(unsigned long freq) return 0; } -static void __init ftm_timer_init(struct device_node *np) +static int __init ftm_timer_init(struct device_node *np) { unsigned long freq; - int irq; + int ret, irq; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) - return; + return -ENOMEM; + ret = -ENXIO; priv->clkevt_base = of_iomap(np, 0); if (!priv->clkevt_base) { pr_err("ftm: unable to map event timer registers\n"); @@ -337,6 +338,7 @@ static void __init ftm_timer_init(struct device_node *np) goto err; } + ret = -EINVAL; irq = irq_of_parse_and_map(np, 0); if (irq <= 0) { pr_err("ftm: unable to get IRQ from DT, %d\n", irq); @@ -349,18 +351,22 @@ static void __init ftm_timer_init(struct device_node *np) if (!freq) goto err; - if (ftm_calc_closest_round_cyc(freq)) + ret = ftm_calc_closest_round_cyc(freq); + if (ret) goto err; - if (ftm_clocksource_init(freq)) + ret = ftm_clocksource_init(freq); + if (ret) goto err; - if (ftm_clockevent_init(freq, irq)) + ret = ftm_clockevent_init(freq, irq); + if (ret) goto err; - return; + return 0; err: kfree(priv); + return ret; } -CLOCKSOURCE_OF_DECLARE(flextimer, "fsl,ftm-timer", ftm_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(flextimer, "fsl,ftm-timer", ftm_timer_init);