From patchwork Thu Jun 16 21:27:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70250 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp466762qgy; Thu, 16 Jun 2016 14:35:22 -0700 (PDT) X-Received: by 10.67.13.164 with SMTP id ez4mr7223056pad.32.1466112922703; Thu, 16 Jun 2016 14:35:22 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y89si8008440pff.0.2016.06.16.14.35.22; Thu, 16 Jun 2016 14:35:22 -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 S933452AbcFPVfS (ORCPT + 30 others); Thu, 16 Jun 2016 17:35:18 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:38371 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755305AbcFPV25 (ORCPT ); Thu, 16 Jun 2016 17:28:57 -0400 Received: by mail-wm0-f47.google.com with SMTP id m124so86969427wme.1 for ; Thu, 16 Jun 2016 14:28:57 -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=L483maY88lwBrxjEl9yOgMwKSdFWnEpHacIzT6DhxNw=; b=fp7PsWrJxgYix5q+94TNF9AXWYM9IjEmgwPaUCl6GNuftTkeHPj3U/J/E9LDoilsY3 wQfexpHaNmAqddCzkuoaeXAmswO6DrcB5aQbk9bL/PSnZo3WygEdM/ZH9B+ODmgLMoqy o+ID1xlFkNZlhIMBXTdMwKhMOJCjQJx6659O8= 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=L483maY88lwBrxjEl9yOgMwKSdFWnEpHacIzT6DhxNw=; b=LbGFSF5qJMotSA1g4w6OSohwB7apqZF8oEmPawIVlaHorgaRLq8jy4ZtJBzrMDsq5R ga4dQjD16Z4BJcOhGpVS1DJhVrY0jEe/W5vTYxG3lLwP0R1mofY97fY2aqxJ93IMf1EB GKh/B0IAcXrYvJxG/lOhkUM4AtoS3NhaW8ZtRWLXAP8G9XCjLE9jI9O9BsQAb6IA13Qi rlUBlOfZ112g8TDuXBN0ogXanVTcf7mdVUcSbrxlf/eu8VS47s/+ulKtpGXGltAU+xzu kpzUpO7tFRCWlU6lk6vIybRj+l5TBU9Kp9+hr7b2fkPXAGyrlqdQnwtRf85q0pm8g1Um YD2A== X-Gm-Message-State: ALyK8tKJwpgZEcUGTJyofiPzSEplHlAHghT8BeFsXX6LntAKPzNaXufbpEJ2igOuutaS1IwA X-Received: by 10.28.199.139 with SMTP id x133mr16430771wmf.45.1466112536476; Thu, 16 Jun 2016 14:28:56 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:56 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH V2 41/63] clocksource/drivers/timer-atmel-st: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:00 +0200 Message-Id: <1466112442-31105-42-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-atmel-st.c | 44 +++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 16 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c index 29d21d6..e9331d3 100644 --- a/drivers/clocksource/timer-atmel-st.c +++ b/drivers/clocksource/timer-atmel-st.c @@ -194,15 +194,17 @@ static struct clock_event_device clkevt = { /* * ST (system timer) module supports both clockevents and clocksource. */ -static void __init atmel_st_timer_init(struct device_node *node) +static int __init atmel_st_timer_init(struct device_node *node) { struct clk *sclk; unsigned int sclk_rate, val; int irq, ret; regmap_st = syscon_node_to_regmap(node); - if (IS_ERR(regmap_st)) - panic(pr_fmt("Unable to get regmap\n")); + if (IS_ERR(regmap_st)) { + pr_err("Unable to get regmap\n"); + return PTR_ERR(regmap_st); + } /* Disable all timer interrupts, and clear any pending ones */ regmap_write(regmap_st, AT91_ST_IDR, @@ -211,27 +213,37 @@ static void __init atmel_st_timer_init(struct device_node *node) /* Get the interrupts property */ irq = irq_of_parse_and_map(node, 0); - if (!irq) - panic(pr_fmt("Unable to get IRQ from DT\n")); + if (!irq) { + pr_err("Unable to get IRQ from DT\n"); + return -EINVAL; + } /* Make IRQs happen for the system timer */ ret = request_irq(irq, at91rm9200_timer_interrupt, IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL, "at91_tick", regmap_st); - if (ret) - panic(pr_fmt("Unable to setup IRQ\n")); + if (ret) { + pr_err("Unable to setup IRQ\n"); + return ret; + } sclk = of_clk_get(node, 0); - if (IS_ERR(sclk)) - panic(pr_fmt("Unable to get slow clock\n")); + if (IS_ERR(sclk)) { + pr_err("Unable to get slow clock\n"); + return PTR_ERR(sclk); + } - clk_prepare_enable(sclk); - if (ret) - panic(pr_fmt("Could not enable slow clock\n")); + ret = clk_prepare_enable(sclk); + if (ret) { + pr_err("Could not enable slow clock\n"); + return ret; + } sclk_rate = clk_get_rate(sclk); - if (!sclk_rate) - panic(pr_fmt("Invalid slow clock rate\n")); + if (!sclk_rate) { + pr_err("Invalid slow clock rate\n"); + return -EINVAL; + } timer_latch = (sclk_rate + HZ / 2) / HZ; /* The 32KiHz "Slow Clock" (tick every 30517.58 nanoseconds) is used @@ -246,7 +258,7 @@ static void __init atmel_st_timer_init(struct device_node *node) 2, AT91_ST_ALMV); /* register clocksource */ - clocksource_register_hz(&clk32k, sclk_rate); + return clocksource_register_hz(&clk32k, sclk_rate); } -CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", +CLOCKSOURCE_OF_DECLARE_RET(atmel_st_timer, "atmel,at91rm9200-st", atmel_st_timer_init);