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: 9202751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84F20608A6 for ; Tue, 28 Jun 2016 10:44:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 712AB28604 for ; Tue, 28 Jun 2016 10:44:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65F51285F6; Tue, 28 Jun 2016 10:44:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D3382285FC for ; Tue, 28 Jun 2016 10:44:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHqT7-0002xe-Un; Tue, 28 Jun 2016 10:42:13 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHqLX-0006xu-EL for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2016 10:34:24 +0000 Received: by mail-wm0-x234.google.com with SMTP id r201so20923287wme.1 for ; Tue, 28 Jun 2016 03:34:07 -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=lJF+NaJcFEsuQ1vzY0YNWQKgPCY1GRTGtb6oSERvWISsili0pa5CX6Q4m+Fg+iKRpM H5rfA3PuUCPIRNHptMFoLRGpG7J05c7YDVW6aaCfYBewV+gKkwt91tq7k92Yh1qRt/uE hAFoBiEbcIIc+e/XS4pouIOzvlPac346464C9hhSCbOmkDwaHyVjxxLrXyGVT9wy148e 6dbwLFoVCS1G0HMJFDHGdMCY0gcgbjm/JHVa/XAtFk4kiGRL1w51Q+Mfs7LEWWAaxdIo eqKiJn71BzMVk14IKk+sgp7jBJYdjp40Nb4N3sy/NDaIybeRF6rB62h/Ns+llRKBuRIo n5/A== X-Gm-Message-State: ALyK8tInx38HI6rcxBva6/tGBe0Gbk4RXejd9j5FK5q2a+0kMY7V2Fhvr6dZtyC0OkO7hMtE 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160628_033423_918216_01FD4237 X-CRM114-Status: GOOD ( 13.88 ) 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, linux-arm-kernel@lists.infradead.org, Santosh Shilimkar MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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);