From patchwork Tue Jun 28 10:30:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70990 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1509266qgy; Tue, 28 Jun 2016 03:33:26 -0700 (PDT) X-Received: by 10.66.150.10 with SMTP id ue10mr488925pab.71.1467110001047; Tue, 28 Jun 2016 03:33:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p5si6323824pfp.124.2016.06.28.03.33.20; Tue, 28 Jun 2016 03:33:21 -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 S1752717AbcF1KdO (ORCPT + 30 others); Tue, 28 Jun 2016 06:33:14 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35593 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932103AbcF1KdJ (ORCPT ); Tue, 28 Jun 2016 06:33:09 -0400 Received: by mail-wm0-f47.google.com with SMTP id v199so133584361wmv.0 for ; Tue, 28 Jun 2016 03:33:08 -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=IU4zPL0umR1mJ5novcRQJarHzpuc0wpQ6P6+MgTnXcU=; b=CCAUawy2X6vYvjtpmpzk6fSjqPC1yDyYLL2E58iZTc9k3vvPM5Rq7KdPMSFuvTmC4h gG/4uuoR6dLC4pOoO3qj/Iep7YNSaGPFV/EpBr6Lg3jn8oeFwpD7LfNYDg/Skj+jgIoL Ba0RfbzwjIi0Ngnd2fK2J3HZSqdxyd6XIGGtw= 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=IU4zPL0umR1mJ5novcRQJarHzpuc0wpQ6P6+MgTnXcU=; b=RIZl4eHHtgVPEkUsUpq5IDCT9V0t0oobk/NfJIAr0ZPyhb9ZkBx9a4W//S5eGlMMKJ jpmmrHgrdbVpOiGshDP+ijFVeAbJbqULchYWCPATGOuNHmCsnZniGpqQuBOKJhOr/rsE qk+yQBdtXSi/H4J6HLLAPj1bi0Z/rjkJDHCdFVc5SrL4rN/9nNOZiT/fIgNyOGzzgHww 2r/0X4xiVXYjEqrfo7V1iup9UtXCimVVmnG8whoBl0UzFb/DBacaqYCtVHzhGQFIdlJF ARwrjQyBzdMa0WIsdu4Lzx5Lfo1jPjS6Y5W+ZFXA2NxZxnrbGObx9vnHKTAzEVn5i1jQ jHvw== X-Gm-Message-State: ALyK8tIIe2p1dHZKBOd2UBR8F2IeN6OSGPLm/TvFXQTvxpi5cYehzK9HxTAHrTvM1bPBSoTd X-Received: by 10.28.38.133 with SMTP id m127mr2809046wmm.50.1467109987968; Tue, 28 Jun 2016 03:33:07 -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.33.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:07 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH 14/92] clocksource/drivers/mtk_timer: Convert init function to return error Date: Tue, 28 Jun 2016 12:30:33 +0200 Message-Id: <1467109911-11060-14-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: Matthias Brugger --- drivers/clocksource/mtk_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 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);