From patchwork Tue Jun 28 10:31:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71003 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1509782qgy; Tue, 28 Jun 2016 03:34:49 -0700 (PDT) X-Received: by 10.98.200.81 with SMTP id z78mr471816pff.143.1467110086852; Tue, 28 Jun 2016 03:34:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l24si33040779pfj.19.2016.06.28.03.34.46; Tue, 28 Jun 2016 03:34:46 -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 S1753023AbcF1Kei (ORCPT + 30 others); Tue, 28 Jun 2016 06:34:38 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36347 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752950AbcF1KeY (ORCPT ); Tue, 28 Jun 2016 06:34:24 -0400 Received: by mail-wm0-f41.google.com with SMTP id f126so133936596wma.1 for ; Tue, 28 Jun 2016 03:34:23 -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=LgbT7auWZxM6lUAo9JR9uoM7u/K6dv/nhBdNnk2Ics0=; b=VoYrp3s7o7W5jLyQ+XlWNjiY+GV6qBWiUxSrM6OdSiGKrxCW2A29HZbmrs+lQEyKY0 oeFrgNFg/CRKYqXejn0YgQGn+MixOAql28Gw0k+ybTAiggkzIxn1Op7/cu8mPIybpRgS /JVCJDahkg8g0ZbYez4OAAxscmQabBwYb0i5k= 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=LgbT7auWZxM6lUAo9JR9uoM7u/K6dv/nhBdNnk2Ics0=; b=Nf7BrTObVtUjoYVoNklhx/LPOdApPf5aZnfor3yj5asygoZK8bxAFGtVzCRgh/jb7H 9wvB3n/M9WcYyXsM87sTdqHsTFrLRkwnidyT4mf6G9x/1cN8mQEuaab+jjffymwpIA+X dIuCdwzF/uB8q+arTRFibdGuqKRF/lq4TLUddrlIDqEjl+/6xI1nHhN9r9x8AVCs6G60 0j5rXtF3N+XE2hs3vBOKiQm0wX3VN3nDXKlHfRv9hf1fb/e3uZso2SnkQpxXuNVA0bpr dMir8YqS1fOFYT2fPqQ0nvfBcz0v11ch8JHbfh0FSt6Mo+7T81lW2igYitdGLTGu26Wa MK+w== X-Gm-Message-State: ALyK8tJy9pqZwkwx+zevQmkuuI5ZW+FBGpfBvj9luMnOzCHrOyAWDheuGeELs9ht2g/XO9lR X-Received: by 10.194.88.106 with SMTP id bf10mr2613766wjb.37.1467110062619; Tue, 28 Jun 2016 03:34:22 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:22 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 63/92] clocksource/drivers/vt8500: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:22 +0200 Message-Id: <1467109911-11060-63-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 --- drivers/clocksource/vt8500_timer.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) -- 1.9.1 diff --git a/drivers/clocksource/vt8500_timer.c b/drivers/clocksource/vt8500_timer.c index ddb4092..1bc8707 100644 --- a/drivers/clocksource/vt8500_timer.c +++ b/drivers/clocksource/vt8500_timer.c @@ -121,38 +121,48 @@ static struct irqaction irq = { .dev_id = &clockevent, }; -static void __init vt8500_timer_init(struct device_node *np) +static int __init vt8500_timer_init(struct device_node *np) { - int timer_irq; + int timer_irq, ret; regbase = of_iomap(np, 0); if (!regbase) { pr_err("%s: Missing iobase description in Device Tree\n", __func__); - return; + return -ENXIO; } + timer_irq = irq_of_parse_and_map(np, 0); if (!timer_irq) { pr_err("%s: Missing irq description in Device Tree\n", __func__); - return; + return -EINVAL; } writel(1, regbase + TIMER_CTRL_VAL); writel(0xf, regbase + TIMER_STATUS_VAL); writel(~0, regbase + TIMER_MATCH_VAL); - if (clocksource_register_hz(&clocksource, VT8500_TIMER_HZ)) + ret = clocksource_register_hz(&clocksource, VT8500_TIMER_HZ); + if (ret) { pr_err("%s: vt8500_timer_init: clocksource_register failed for %s\n", - __func__, clocksource.name); + __func__, clocksource.name); + return ret; + } clockevent.cpumask = cpumask_of(0); - if (setup_irq(timer_irq, &irq)) + ret = setup_irq(timer_irq, &irq); + if (ret) { pr_err("%s: setup_irq failed for %s\n", __func__, clockevent.name); + return ret; + } + clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ, MIN_OSCR_DELTA * 2, 0xf0000000); + + return 0; } -CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(vt8500, "via,vt8500-timer", vt8500_timer_init);