From patchwork Tue Jun 28 10:31:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71026 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1511816qgy; Tue, 28 Jun 2016 03:40:00 -0700 (PDT) X-Received: by 10.66.246.135 with SMTP id xw7mr485021pac.141.1467110400237; Tue, 28 Jun 2016 03:40:00 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 69si33097160pfr.155.2016.06.28.03.39.58; Tue, 28 Jun 2016 03:40:00 -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 S932191AbcF1Kjw (ORCPT + 30 others); Tue, 28 Jun 2016 06:39:52 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:36034 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752882AbcF1KeG (ORCPT ); Tue, 28 Jun 2016 06:34:06 -0400 Received: by mail-wm0-f46.google.com with SMTP id f126so133923076wma.1 for ; Tue, 28 Jun 2016 03:34:05 -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=SHedAu3V0Xai2A5Jze0tUfAvF24cXJ4nP0G4CQ1O/47dMzCjAFpBT9wHdVc4CWJRLo ggN5T7VW0fVkQtlutR6JptgO8X5qYInx/G6fCuTD6+gmw5mMYRAgDr2v2SVEr75CHu/S vNBCeiJfpWPXHOu9eh06TD7MTBKHKjIZOzNJU= 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=jCY08bcxtzAjpHCvTdrtg4nqccnwW1YzdQpdajVuS0u1YOd6TfD7H7/LI7f0mU8Z5F Wjv+TmPqQiT7TyGUjcq5EIJNmW7xh5OEbQk7PrOac9ln5HLtxncXSJHTJAlPFiRT7mvs q6canQoCJiTyhM/KuZmZtEyYTBACT7x1QJhyQPQYGP3x+gaUURxXMwDTDzMJnxbDKBcf kZrNgsbTEiig9woUQyfIghuSvZjx4zV+mlGkySzXCQYY/zwnrFSMPbIvJhkQuTrfcC5Q YqmvKgJrnkb1hkbbTO1GGvVHW/jTmtHa8+y8RU1xYBDx134+H8vbQNpI9ByvPFuEvd3O 73pg== X-Gm-Message-State: ALyK8tI0UsAZxACfCF3P/ouJ1ofHqUgHRTI3m9RPDDZAIBPCVOj0dB3gU2s1yqag5pH1c566 X-Received: by 10.194.85.161 with SMTP id i1mr2475262wjz.95.1467110039909; Tue, 28 Jun 2016 03:33:59 -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 a84sm5377403wma.0.2016.06.28.03.33.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:59 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org Subject: [PATCH 51/92] clocksource/drivers/atmel-st: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:10 +0200 Message-Id: <1467109911-11060-51-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467109911-11060-1-git-send-email-daniel.lezcano@linaro.org> References: <577251A4.7030508@linaro.org> <1467109911-11060-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);