From patchwork Tue Jun 28 10:31:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71024 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1511711qgy; Tue, 28 Jun 2016 03:39:39 -0700 (PDT) X-Received: by 10.98.53.6 with SMTP id c6mr537861pfa.47.1467110379089; Tue, 28 Jun 2016 03:39:39 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z6si5855342pas.133.2016.06.28.03.39.38; Tue, 28 Jun 2016 03:39:39 -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 S932177AbcF1Kjh (ORCPT + 30 others); Tue, 28 Jun 2016 06:39:37 -0400 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37743 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752889AbcF1KeH (ORCPT ); Tue, 28 Jun 2016 06:34:07 -0400 Received: by mail-wm0-f48.google.com with SMTP id a66so20962403wme.0 for ; Tue, 28 Jun 2016 03:34: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=d7wiYdEzIxHg0ZvZkoSH9JcSqJqaZ3ROAOFSzgNZZlk=; b=K9yywH9kWbfsJjKCklhPdQGhF/P+tjnFXe2XF112/QvAVxPjjczO39xwZKlwxh+Bkm mzdjwSQkjoTfjsgL125KrgTacmZkxuZBixJftMlWYoELSCGRKy5GTBOCdGt7dNt8l97o r7QKzRR6bCivD1LLvQ67J2+VQBFdZAKD0i7j0= 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=d7wiYdEzIxHg0ZvZkoSH9JcSqJqaZ3ROAOFSzgNZZlk=; b=k01m3xEiaDqFlnqJ7EmkQ5CoDb5sKPej0QpVGfewiGwalEg3NUFw9SeGMVMVvRZsAE zOZIZQPjsoRMT0tco0FqSz026MNfLP+PQNPe0EUNOTok9CRZkpLoA7T6FT06w1ZKoTX0 CcCoDmCff9fydG8lbc+HhdOYuje3x0jcCR2FDWPT1rCEli7W3b/KSGnL+lYRNZnNrVZW gyrVlqr3nxvXW1NLsPFX9wLy1As30Bkr9leMpdD6AORsEt2DiXlR8gbqCCAZDYVnKbEW 9n3MS74xqjxi1CaNXqDIae8FByELSxUi1fFcljPPVjBFzORO4g1Ks7lTQRYU7AXjemPH mPEg== X-Gm-Message-State: ALyK8tL7zogfCxk6jNMgoixA76uVvvc5SPZV77BRNX2TtGrHPnvOjqxh+1X+49SIf0wzjxXk X-Received: by 10.28.138.85 with SMTP id m82mr2910600wmd.88.1467110046175; Tue, 28 Jun 2016 03:34:06 -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.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:04 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Santosh Shilimkar , linux-arm-kernel@lists.infradead.org Subject: [PATCH 55/92] clocksource/drivers/keystone: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:14 +0200 Message-Id: <1467109911-11060-55-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 Acked-by: Santosh Shilimkar --- drivers/clocksource/timer-keystone.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/timer-keystone.c b/drivers/clocksource/timer-keystone.c index 1cea08c..4199823 100644 --- a/drivers/clocksource/timer-keystone.c +++ b/drivers/clocksource/timer-keystone.c @@ -144,7 +144,7 @@ static int keystone_set_periodic(struct clock_event_device *evt) return 0; } -static void __init keystone_timer_init(struct device_node *np) +static int __init keystone_timer_init(struct device_node *np) { struct clock_event_device *event_dev = &timer.event_dev; unsigned long rate; @@ -154,20 +154,20 @@ static void __init keystone_timer_init(struct device_node *np) irq = irq_of_parse_and_map(np, 0); if (!irq) { pr_err("%s: failed to map interrupts\n", __func__); - return; + return -EINVAL; } timer.base = of_iomap(np, 0); if (!timer.base) { pr_err("%s: failed to map registers\n", __func__); - return; + return -ENXIO; } clk = of_clk_get(np, 0); if (IS_ERR(clk)) { pr_err("%s: failed to get clock\n", __func__); iounmap(timer.base); - return; + return PTR_ERR(clk); } error = clk_prepare_enable(clk); @@ -219,11 +219,12 @@ static void __init keystone_timer_init(struct device_node *np) clockevents_config_and_register(event_dev, rate, 1, ULONG_MAX); pr_info("keystone timer clock @%lu Hz\n", rate); - return; + return 0; err: clk_put(clk); iounmap(timer.base); + return error; } -CLOCKSOURCE_OF_DECLARE(keystone_timer, "ti,keystone-timer", - keystone_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(keystone_timer, "ti,keystone-timer", + keystone_timer_init);