From patchwork Thu Jun 16 21:27:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70249 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp466469qgy; Thu, 16 Jun 2016 14:34:28 -0700 (PDT) X-Received: by 10.98.99.132 with SMTP id x126mr7575219pfb.48.1466112868590; Thu, 16 Jun 2016 14:34:28 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id t6si7983513pfb.72.2016.06.16.14.34.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 14:34:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDeui-0001U8-6p; Thu, 16 Jun 2016 21:33:24 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDeql-0003Q9-KB for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 21:29:24 +0000 Received: by mail-wm0-x236.google.com with SMTP id f126so66416841wma.1 for ; Thu, 16 Jun 2016 14:29:03 -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=kf2Acn2ZpjPfMzDS4SxKRGAwUO5mSn8IkB6EjYDdaBg=; b=VAmukwdtpdUfOOVHpvxXUXDViof5AGfzmdYPAuC10PktWd27xHF60yxkVO2+oUgcVt k23w+iChcA+9aX+LQx8+W+Jfxj38jlTZ/y31+K1Feu67EidE78edjGq6TwX1f8TfaOrG 1GIwfltiZLelJtQW2YuD2T7PCVn7RMsH4cknI= 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=kf2Acn2ZpjPfMzDS4SxKRGAwUO5mSn8IkB6EjYDdaBg=; b=csXFNSOeYcLyKPb3MtSxXHmMAeZxXjGLPWq61bG3zusiP1y9065BcmuTh+3G5jwPs+ GKQt+MwLPKJwmEAYuolg4WJtcu7PXhKO/2fVegomdoLUQIlRk4FWXua5CM/dug7nhu9v 2Hk0eTc3lbhwXFWQg/OzrATyina4xciK8srPiob3jmEb2ZdVqr6U5FGFHRXbVAazQiC0 h8Azx4hc1XWQlbj5e66JHhurrBKYeEB7HW49Q3NdsDxaRmgoswynwpeK0Bbrz3Ih54dF Tk//dVNxseTut2RdeTd6NcPO0y1nY8D73RCvP1g2accmBw2oLN6Bqg++qb7iJvq01stH 1jTg== X-Gm-Message-State: ALyK8tLeEcEg6hbW1x5M7xWtRJmF+NtgxIOw2JWWssaEUU/UpLwp3J0+iDdWNFlH5yCYxo+b X-Received: by 10.194.139.162 with SMTP id qz2mr1383443wjb.111.1466112542694; Thu, 16 Jun 2016 14:29:02 -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 x128sm16705606wmf.6.2016.06.16.14.29.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:02 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH V2 45/63] clocksource/drivers/timer-keystone: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:04 +0200 Message-Id: <1466112442-31105-46-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> References: <1466112442-31105-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160616_142920_096300_53C22B3D X-CRM114-Status: GOOD ( 13.59 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:236 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, "moderated list:ARM/TEXAS INSTRUM..." , Santosh Shilimkar MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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-keystone.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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);