From patchwork Thu Jul 7 08:01:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71531 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1274176qgy; Thu, 7 Jul 2016 01:10:01 -0700 (PDT) X-Received: by 10.66.159.66 with SMTP id xa2mr24182873pab.20.1467879001088; Thu, 07 Jul 2016 01:10:01 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o6si2968208paf.168.2016.07.07.01.10.00; Thu, 07 Jul 2016 01:10:01 -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 S1030387AbcGGIEg (ORCPT + 30 others); Thu, 7 Jul 2016 04:04:36 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35580 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030231AbcGGIDx (ORCPT ); Thu, 7 Jul 2016 04:03:53 -0400 Received: by mail-wm0-f49.google.com with SMTP id z126so138064112wme.0 for ; Thu, 07 Jul 2016 01:03:52 -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=AE9XXtZjhdXZgJorpG2uo2MRmiEgeAYdzjPf2iAY7pkCdb+alJte7vYjDW8XLTujf5 Y+RnyihOgB3rWeSrjQLA000N7Bgg7zem44pUG6q7bbFjkmIyPZEOvqzrI2YFEStfuYVI XWNtdhWwR0f3TttiUR+Z1ENLWtSvYZ48Ca7U0= 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=FiFa4u2IVor52rBwudO6++ixnsYmOSTpoBaYpbDGn2atpJOtg/S3P/ErvnNZDTTnz9 kK/6zNj7sonaEkoq6d7D0CLvpfHdJH3EUORRZBvgLVx3dQcbm95cKjzOWOwEHuJXOrZX i3xtDWeZhBY0IXY7CjRORTMy7di2c23K3ESo0w4fA912puTKgUkX01Fslvl3tpMBMVzw /jp4orsYHXA9h1gr8d+FoyOfq0qLncBKwD/RuP3a6riCcCWkUj82j+5gk9KZpTElXo6c 2Z2wIDX0FqV2U7MZE0wpFsjBElQgxsu4YEGlrvLN5epo6+wZ8QWQegZD2uH2haCK/xkY 4R2A== X-Gm-Message-State: ALyK8tLkWE+VCJ/39nDMBqc6rXM+NdGoAEaRYSDNgJ10p4HDYZuBQYyCQy5IZ59s417DKRpm X-Received: by 10.28.199.139 with SMTP id x133mr23520200wmf.45.1467878631951; Thu, 07 Jul 2016 01:03:51 -0700 (PDT) Received: from localhost.localdomain (lft31-1-88-121-166-205.fbx.proxad.net. [88.121.166.205]) by smtp.gmail.com with ESMTPSA id v70sm51327wmf.18.2016.07.07.01.03.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:51 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Cc: linux-kernel@vger.kernel.org, Santosh Shilimkar , linux-arm-kernel@lists.infradead.org Subject: [PATCH 55/93] clocksource/drivers/keystone: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:28 +0200 Message-Id: <1467878526-1238-55-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> References: <577E0BED.3020608@linaro.org> <1467878526-1238-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);