From patchwork Wed Jun 1 08:34:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9146415 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 4BB3760761 for ; Wed, 1 Jun 2016 08:37:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C789200E7 for ; Wed, 1 Jun 2016 08:37:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 314FB26538; Wed, 1 Jun 2016 08:37:34 +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 66031200E7 for ; Wed, 1 Jun 2016 08:37:32 +0000 (UTC) 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 1b81dM-0004H2-OB; Wed, 01 Jun 2016 08:36:12 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b81d8-0003ir-9o for linux-arm-kernel@lists.infradead.org; Wed, 01 Jun 2016 08:36:00 +0000 Received: by mail-wm0-x22b.google.com with SMTP id n184so19433907wmn.1 for ; Wed, 01 Jun 2016 01:35:37 -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=DHx7k25J9gTUZGWBJtiBe/AXQfH4gokvau1ccoCEJ4w=; b=N6O0/2VMTD43LjtCVxnn8CtwXwg45RyFyjzQ6rVfJKv3iDjkukVV7I6g52i/2fI5Vb ELWMDu/+RetI/Ozp19eO8fJPI9wf5o3gbzjw7o0psQn/TEEpcqDiNEwM3lI6LZLR+i1t sBwEh/TJT141ysV3nSEv6l2EsNONgDs+A/9RQ= 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=DHx7k25J9gTUZGWBJtiBe/AXQfH4gokvau1ccoCEJ4w=; b=Rh5M9bUtQEhVwLxQXAD0CX7wzvJEb3I5694CuP7tA6SKpJUKRD4VmhFsayuhc3ajW1 tro9t631iGEgmpHe0S43zu7YXIuEf/9qI3jbbQNJZQxoeWLdslVLjpV0wZDFlAO3Z2RX 6WL2+F1OeMkMOAduL+B8et2Aulkl2HttX6TcXwiswMbS10fTR0EtguKwih0rOjX+Nlty bSEm2nlVhokomAEx79jTwbhpwXqxYtikJmq3AAmPfZMx99DxwM+jXov4GBs9b6z2vFBF QJToKRSEXJWXNsfA3OnEGaGLWJDuhj1UoBkDBwo2kpsSK5CSoCYFRZk3C4KPjtSFoDYt oIZA== X-Gm-Message-State: ALyK8tImN2mFt9092h5tOBiHQ6BGhhYjjeI62xMYsBI7O5h9z1sy4lpH8MSgW31rQbPXmA1f X-Received: by 10.28.210.72 with SMTP id j69mr19405136wmg.85.1464770136715; Wed, 01 Jun 2016 01:35:36 -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 t3sm33542865wmf.20.2016.06.01.01.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Jun 2016 01:35:36 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH 4/9] clocksource/drivers/mkt_timer: Convert init function to return error Date: Wed, 1 Jun 2016 10:34:47 +0200 Message-Id: <1464770093-12667-5-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464770093-12667-1-git-send-email-daniel.lezcano@linaro.org> References: <1464770093-12667-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160601_013558_644618_A9F5415F X-CRM114-Status: GOOD ( 14.62 ) 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: Matthias Brugger , "moderated list:ARM/Mediatek SoC..." , linux-kernel@vger.kernel.org, "moderated list:ARM/Mediatek SoC..." 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 --- drivers/clocksource/mtk_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/mtk_timer.c b/drivers/clocksource/mtk_timer.c index 7e583f8..432a2c0 100644 --- a/drivers/clocksource/mtk_timer.c +++ b/drivers/clocksource/mtk_timer.c @@ -181,7 +181,7 @@ static void mtk_timer_enable_irq(struct mtk_clock_event_device *evt, u8 timer) evt->gpt_base + GPT_IRQ_EN_REG); } -static void __init mtk_timer_init(struct device_node *node) +static int __init mtk_timer_init(struct device_node *node) { struct mtk_clock_event_device *evt; struct resource res; @@ -190,7 +190,7 @@ static void __init mtk_timer_init(struct device_node *node) evt = kzalloc(sizeof(*evt), GFP_KERNEL); if (!evt) - return; + return -ENOMEM; evt->dev.name = "mtk_tick"; evt->dev.rating = 300; @@ -248,7 +248,7 @@ static void __init mtk_timer_init(struct device_node *node) mtk_timer_enable_irq(evt, GPT_CLK_EVT); - return; + return 0; err_clk_disable: clk_disable_unprepare(clk); @@ -262,5 +262,7 @@ err_mem: release_mem_region(res.start, resource_size(&res)); err_kzalloc: kfree(evt); + + return -EINVAL; } -CLOCKSOURCE_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(mtk_mt6577, "mediatek,mt6577-timer", mtk_timer_init);