From patchwork Fri Jun 17 09:06:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70294 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp177317qgy; Fri, 17 Jun 2016 02:07:29 -0700 (PDT) X-Received: by 10.36.228.78 with SMTP id o75mr33595255ith.47.1466154449312; Fri, 17 Jun 2016 02:07:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cu4si1282109pad.192.2016.06.17.02.07.29; Fri, 17 Jun 2016 02:07:29 -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 S1755463AbcFQJHO (ORCPT + 30 others); Fri, 17 Jun 2016 05:07:14 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:36060 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754329AbcFQJHH (ORCPT ); Fri, 17 Jun 2016 05:07:07 -0400 Received: by mail-wm0-f49.google.com with SMTP id f126so80573879wma.1 for ; Fri, 17 Jun 2016 02:07:06 -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=vRA7DYdnuP0guhhgJXku16VH1UxzLNTwJXAElbr/xkA=; b=VX8hNXrLsmT5btYyDGeaiLo8LgiMKg/DYC6outqvDYS77iTws1A49XzU8b+pk7Yh0C TGKhCfNd+YHrspib/cMJfiCqn4GjUu0bG1DxjVuZUhXTdqZwrkpp1Qw6o/KiHIqFiG5t nmNuDi+sFS5alqYhqE/Z8AVFXkRmcJmhs9N5c= 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=vRA7DYdnuP0guhhgJXku16VH1UxzLNTwJXAElbr/xkA=; b=FncYSZa6x44BvE/WiN3COoooG6iJCGK03PaHBGh3+X5edtcuhCTUS874NWDgn2OLc+ O3Jg9WAuVGpY5KFv4v9GlRVUM1UeJAEUh+Pd4yUsyARLKMTdyZ2SH+96oKAfZura8Mj5 6rF1CmtykmrZZTW0rL21sf+AgeizBz5T8xxGj2tUGuEGlQqmSo4vj99aLVLjOD7ZzlR4 n9Sh2hCMX5u28AoJf/ygV9FTG9Zw+GhASHojQ81Kb97WLGkQcaR/Gkq6CC1WBAkr4i/E yNuEs92NcMnx4DcrHHC3r5nFqp9vVP36pwh/Q3MahhEwmZIummWrBcYjEQ5wPHRm/fI2 2TdQ== X-Gm-Message-State: ALyK8tIufAVLtnWpL5PxXoEbOs1B2ZpDm69IcoAMSNhjOXcVoFnj5/eV3LUapCIgzm+V4Zu3 X-Received: by 10.28.105.216 with SMTP id z85mr1237560wmh.75.1466154425782; Fri, 17 Jun 2016 02:07:05 -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 f196sm2195935wmg.15.2016.06.17.02.07.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jun 2016 02:07:04 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, jonathanh@nvidia.com, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, thierry.reding@gmail.com, swarren@wwwdotorg.org, linux-tegra@vger.kernel.org Subject: [PATCH V3] clocksource/drivers/tegra20: Convert init function to return error Date: Fri, 17 Jun 2016 11:06:51 +0200 Message-Id: <1466154411-19922-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <5763A4F4.30102@nvidia.com> References: <5763A4F4.30102@nvidia.com> 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/tegra20_timer.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c index 7b94ad2..543c37e 100644 --- a/drivers/clocksource/tegra20_timer.c +++ b/drivers/clocksource/tegra20_timer.c @@ -165,7 +165,7 @@ static struct irqaction tegra_timer_irq = { .dev_id = &tegra_clockevent, }; -static void __init tegra20_init_timer(struct device_node *np) +static int __init tegra20_init_timer(struct device_node *np) { struct clk *clk; unsigned long rate; @@ -174,13 +174,13 @@ static void __init tegra20_init_timer(struct device_node *np) timer_reg_base = of_iomap(np, 0); if (!timer_reg_base) { pr_err("Can't map timer registers\n"); - BUG(); + return -ENXIO; } tegra_timer_irq.irq = irq_of_parse_and_map(np, 2); if (tegra_timer_irq.irq <= 0) { pr_err("Failed to map timer IRQ\n"); - BUG(); + return -EINVAL; } clk = of_clk_get(np, 0); @@ -211,10 +211,12 @@ static void __init tegra20_init_timer(struct device_node *np) sched_clock_register(tegra_read_sched_clock, 32, 1000000); - if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US, - "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) { + ret = clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US, + "timer_us", 1000000, 300, 32, + clocksource_mmio_readl_up); + if (ret) { pr_err("Failed to register clocksource\n"); - BUG(); + return ret; } tegra_delay_timer.read_current_timer = @@ -225,24 +227,26 @@ static void __init tegra20_init_timer(struct device_node *np) ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq); if (ret) { pr_err("Failed to register timer IRQ: %d\n", ret); - BUG(); + return ret; } tegra_clockevent.cpumask = cpu_all_mask; tegra_clockevent.irq = tegra_timer_irq.irq; clockevents_config_and_register(&tegra_clockevent, 1000000, 0x1, 0x1fffffff); + + return 0; } -CLOCKSOURCE_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer); +CLOCKSOURCE_OF_DECLARE_RET(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer); -static void __init tegra20_init_rtc(struct device_node *np) +static int __init tegra20_init_rtc(struct device_node *np) { struct clk *clk; rtc_base = of_iomap(np, 0); if (!rtc_base) { pr_err("Can't map RTC registers"); - BUG(); + return -ENXIO; } /* @@ -255,6 +259,6 @@ static void __init tegra20_init_rtc(struct device_node *np) else clk_prepare_enable(clk); - register_persistent_clock(NULL, tegra_read_persistent_clock64); + return register_persistent_clock(NULL, tegra_read_persistent_clock64); } -CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc); +CLOCKSOURCE_OF_DECLARE_RET(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);