From patchwork Thu Jul 7 08:00:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71563 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1283757qgy; Thu, 7 Jul 2016 01:36:25 -0700 (PDT) X-Received: by 10.98.207.4 with SMTP id b4mr3195687pfg.20.1467880585209; Thu, 07 Jul 2016 01:36:25 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f6si3085273pfc.249.2016.07.07.01.36.24; Thu, 07 Jul 2016 01:36:25 -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 S1756905AbcGGIgW (ORCPT + 30 others); Thu, 7 Jul 2016 04:36:22 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36552 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933338AbcGGIDK (ORCPT ); Thu, 7 Jul 2016 04:03:10 -0400 Received: by mail-wm0-f51.google.com with SMTP id f126so200119616wma.1 for ; Thu, 07 Jul 2016 01:03:10 -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=GEmf3RxcMzU6/fGFI6zH3k7ib/9X2SzoBl35VmHkycpfJfkoIKBAL0vV+jUBZJr89i LkwB2kCdnlkOIzQ8paNNBPBDZy7B2CEi+rugqoaOrc22WTpbskuxok9N1QMJLJE4OMSO ubemC8xMsiaFTNM2gxBtIGMo2t/ujmTcmmW58= 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=FvzybttY3g44QLx2JM2G7E5GBz7x+Og9kM3u4HTXUg+irVQt/8Zu5fWvJPGtI9RxdR t/bFF7g0KNBujy8o+EPT1AczwdAy93jqvQgdGX/hf56fz4N7Z+VrAEbeMbfgntzQwbpv 9RuxLDNbw46qu64jgriAOCSupklgBJhGGa3WHCIf4T0bRwb5HDVBid8Ln4veOeYIL4kE w9m5suE9u0Y7pUi34GBBF3dGjZTMah002nTXfm+cicSyf5A/Je1M6WJMT1lvYHcrCZrJ psII1UgKvoDQp8U7dn3+W3BFJEGV3Mq9K2EO+fKIvwPod8KytfWtaf0njtNMsatTZ8K7 5hKQ== X-Gm-Message-State: ALyK8tLIkOV8VtS+bDZMtw2iUqBbSsisMIpguL9ZPMLkHkAdfcZALwOk1GYRXsOQymDkzMSV X-Received: by 10.28.31.204 with SMTP id f195mr1328274wmf.45.1467878589145; Thu, 07 Jul 2016 01:03:09 -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.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:07 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 26/93] clocksource/drivers/fsl_ftm_timer: Convert init function to return error Date: Thu, 7 Jul 2016 10:00:59 +0200 Message-Id: <1467878526-1238-26-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/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);