From patchwork Thu Jun 16 21:26:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70222 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp464833qgy; Thu, 16 Jun 2016 14:29:48 -0700 (PDT) X-Received: by 10.98.32.148 with SMTP id m20mr7405671pfj.77.1466112588921; Thu, 16 Jun 2016 14:29:48 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id d81si834041pfb.192.2016.06.16.14.29.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 14:29:48 -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 1bDeqE-0003E4-Sv; Thu, 16 Jun 2016 21:28:46 +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 1bDepv-0002v8-6R for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 21:28:28 +0000 Received: by mail-wm0-x22b.google.com with SMTP id m124so86946134wme.1 for ; Thu, 16 Jun 2016 14:28:06 -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=A4lHJzgxcl+diH7D1bENxBNKMu/EMEf427s5P2AEi/iX2a/Ej9hgHZ5/XsRvtGQwK+ IUsBoNApD5t+l9DRJaW+02RPKXPbR/HbNAAPHUS6IPwR2F7ltNhGP2nh1kz8HFt6kXEG cI4br7QYbfUyi5Dz9+4NnUNyyL995fPUSUx4I= 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=gaCEsc0zbE0NM4NtZFotw7agJoCO8N8ymILJU5x4tR+bdX21nuCY7tPfV2zQ0RR5pW nvXhQ8KF1I8iHFM4dsPIJNzEQ5exql9IhDdNHw/wo+1InU2jpe2/TjR+CiTuEdP2hRa5 RXESTfPcLyh4jWiBLHA60hhMYkKJF/fTcPIp0P2upTGXbic7BTN5VHkQ1PZzBRQI1Ymh TYYgOiw5R7224DsRnpd74sDpMg9ohkJPBh91BuphtOxjI2r7kRtZM3okHKa3Jo2hKc75 krXFf2F5EfPGUIDfufQVUOoXvsAq2mQD4GkjdHlL80L1JCnIoN5CKwKqgStPuaQ5BT9a 5p+w== X-Gm-Message-State: ALyK8tKp8EXsDsFcumqaD0857RehAmpsrii0rmRXnZfxhuMqnD5X5jtrTPXcRzpM1BuWlPjD X-Received: by 10.194.81.166 with SMTP id b6mr1571435wjy.81.1466112485446; Thu, 16 Jun 2016 14:28:05 -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.28.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:04 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH V2 04/63] clocksource/drivers/mkt_timer: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:23 +0200 Message-Id: <1466112442-31105-5-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_142827_452243_C148AF5F X-CRM114-Status: GOOD ( 14.01 ) 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:22b 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: 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+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/mtk_timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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/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);