From patchwork Tue Jun 28 10:31:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71032 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1512698qgy; Tue, 28 Jun 2016 03:42:21 -0700 (PDT) X-Received: by 10.67.15.72 with SMTP id fm8mr612973pad.50.1467110541124; Tue, 28 Jun 2016 03:42:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pz6si28666331pab.90.2016.06.28.03.42.20; Tue, 28 Jun 2016 03:42:21 -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 S1753089AbcF1KmS (ORCPT + 30 others); Tue, 28 Jun 2016 06:42:18 -0400 Received: from mail-wm0-f43.google.com ([74.125.82.43]:38263 "EHLO mail-wm0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412AbcF1KeD (ORCPT ); Tue, 28 Jun 2016 06:34:03 -0400 Received: by mail-wm0-f43.google.com with SMTP id r201so20920209wme.1 for ; Tue, 28 Jun 2016 03:34:02 -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=g0H4crdaDNZKhxtETDCRQ4KHwIWskPbQldViR1hYEVc=; b=kzhlgBln5l/WCwG1KJl8zsIg2MCKw0En565wB9JxGwgVc65QgB7e6D2XJM3rrO4hTm AMCzp9WsbunRyAOQii7QNa0G77xlY9CrIEob7TTb4K62tBg9BHuVmHx1JvI+teE7CH3+ iYDCzfW859OMa9ut2HJFESYRLKTmP7lTx1qYU= 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=g0H4crdaDNZKhxtETDCRQ4KHwIWskPbQldViR1hYEVc=; b=MeRBt785vAyTx8e4dbdf1uDGJZfbipbhR6RkJ77KCkWTHrJenIxk8nBuMM3qCVgW4a +bI04WwOdPZVlAtQQgG/GNd9Sl1cwimeyhQtoIb5MKKoFI1Xr8eFiDqCF3vpDZu1TDVU v3K1if72ZWfezW7E29uHaHMtXUl19LE+Fzr33GWvJLLkkBzzw59hwtV5yNwv0kybgKKv 7ZsuAbLG6SOFrDupZWPWgBZ5+JDmL+LQ6skB5qZI1eUlQ2F8qZR2UtMEQx6sUfkZsatl VvrX2psuDG376tiZNIa+ZMJ13+43GxPw7chbCKjEYYQRYryVzUbBbJOrwlPIhrsltnnA DAhw== X-Gm-Message-State: ALyK8tJ8acfkqnDCmF17J8wyPbn6Ju6YGLy0CM+9lnfA/23iEjLGJXT9Dc513cs4E6GLF1jM X-Received: by 10.28.11.129 with SMTP id 123mr15812134wml.84.1467110041520; Tue, 28 Jun 2016 03:34:01 -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.34.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:00 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 52/92] clocksource/drivers/prima2: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:11 +0200 Message-Id: <1467109911-11060-52-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-prima2.c | 43 ++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c index 2854c66..7b1084d 100644 --- a/drivers/clocksource/timer-prima2.c +++ b/drivers/clocksource/timer-prima2.c @@ -189,24 +189,36 @@ static void __init sirfsoc_clockevent_init(void) } /* initialize the kernel jiffy timer source */ -static void __init sirfsoc_prima2_timer_init(struct device_node *np) +static int __init sirfsoc_prima2_timer_init(struct device_node *np) { unsigned long rate; struct clk *clk; + int ret; clk = of_clk_get(np, 0); - BUG_ON(IS_ERR(clk)); + if (IS_ERR(clk)) { + pr_err("Failed to get clock"); + return PTR_ERR(clk); + } - BUG_ON(clk_prepare_enable(clk)); + ret = clk_prepare_enable(clk); + if (ret) { + pr_err("Failed to enable clock"); + return ret; + } rate = clk_get_rate(clk); - BUG_ON(rate < PRIMA2_CLOCK_FREQ); - BUG_ON(rate % PRIMA2_CLOCK_FREQ); + if (rate < PRIMA2_CLOCK_FREQ || rate % PRIMA2_CLOCK_FREQ) { + pr_err("Invalid clock rate"); + return -EINVAL; + } sirfsoc_timer_base = of_iomap(np, 0); - if (!sirfsoc_timer_base) - panic("unable to map timer cpu registers\n"); + if (!sirfsoc_timer_base) { + pr_err("unable to map timer cpu registers\n"); + return -ENXIO; + } sirfsoc_timer_irq.irq = irq_of_parse_and_map(np, 0); @@ -216,14 +228,23 @@ static void __init sirfsoc_prima2_timer_init(struct device_node *np) writel_relaxed(0, sirfsoc_timer_base + SIRFSOC_TIMER_COUNTER_HI); writel_relaxed(BIT(0), sirfsoc_timer_base + SIRFSOC_TIMER_STATUS); - BUG_ON(clocksource_register_hz(&sirfsoc_clocksource, - PRIMA2_CLOCK_FREQ)); + ret = clocksource_register_hz(&sirfsoc_clocksource, PRIMA2_CLOCK_FREQ); + if (ret) { + pr_err("Failed to register clocksource"); + return ret; + } sched_clock_register(sirfsoc_read_sched_clock, 64, PRIMA2_CLOCK_FREQ); - BUG_ON(setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq)); + ret = setup_irq(sirfsoc_timer_irq.irq, &sirfsoc_timer_irq); + if (ret) { + pr_err("Failed to setup irq"); + return ret; + } sirfsoc_clockevent_init(); + + return 0; } -CLOCKSOURCE_OF_DECLARE(sirfsoc_prima2_timer, +CLOCKSOURCE_OF_DECLARE_RET(sirfsoc_prima2_timer, "sirf,prima2-tick", sirfsoc_prima2_timer_init);