From patchwork Thu Jun 16 21:27:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9181733 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 DEE9D60776 for ; Thu, 16 Jun 2016 21:38:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0E9427B13 for ; Thu, 16 Jun 2016 21:38:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5FA92838A; Thu, 16 Jun 2016 21:38:25 +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=ham 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 D736927B13 for ; Thu, 16 Jun 2016 21:38:24 +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 1bDey3-00073i-76; Thu, 16 Jun 2016 21:36:51 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDeqz-0003YJ-CD for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 21:29:41 +0000 Received: by mail-wm0-x234.google.com with SMTP id k184so34372550wme.1 for ; Thu, 16 Jun 2016 14:29:12 -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=dK5rJPDsLng4z+w1zlYQO09oxthk0kTWpUMsJmnupOM=; b=NZbuavUxpTj9oBw9K8W1lpw0tA3Vdr/PWpufyPHqeBXpD4zvOGzz4jiYiWMVkzWqT4 X/ns5KWtxUSqP+ze1o4mOiaM8PCg7F/7pngVFHfUEYfvKmYFT92V5mhHn3AgTgFRdRdl mV4k1/U6/zKJ9cJf4h4EgkzaRf3pVi0UWMnpA= 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=dK5rJPDsLng4z+w1zlYQO09oxthk0kTWpUMsJmnupOM=; b=kYlNMKqUdSka6paONRPlOXdseQOrWgR11KpEmvuZdn8x1rFLFR2CyH6FjcFZWeyvLQ oB1j40E2LovY7I5hRzwI1dPSwBmcld8eJQ2YuQDYCqGpySrku50/gDPbiwhWyZE4V+Uz Pmd6TNWGna3vERkiaCbEhV67+6F5Q1eoA5LFlISxK9COyV6glEST/S74ur/Qm8LH7wfm XtIm22rTulwnkS/x8Q5WEbwHRJfdmfvP0GFpbOCkWOZV+5dyf520FOFlBD6bT9uVvJLm DLLvnY8WD0Y8YhzNEnGT0Zgd9D55ISFSD4K3jLza2DrAvhVppC9784qjQq6xAd1FGRXY knbg== X-Gm-Message-State: ALyK8tIEi1DC+EeFUB9Sf8vs7i5/WRc8L08DG8MY4yI3OjEtRDvxBb+E7VPNR9kokH4RPFcT X-Received: by 10.28.229.147 with SMTP id c141mr18348585wmh.5.1466112551517; Thu, 16 Jun 2016 14:29:11 -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.29.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:11 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH V2 51/63] clocksource/drivers/versatile: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:10 +0200 Message-Id: <1466112442-31105-52-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_142933_829744_8E8DEF28 X-CRM114-Status: GOOD ( 13.37 ) 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: Lorenzo Pieralisi , Liviu Dudau , linux-kernel@vger.kernel.org, "moderated list:ARM/VERSATILE EXP..." , Sudeep Holla 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: Liviu Dudau --- drivers/clocksource/versatile.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c index 0a26d3d..8daeffa 100644 --- a/drivers/clocksource/versatile.c +++ b/drivers/clocksource/versatile.c @@ -25,18 +25,20 @@ static u64 notrace versatile_sys_24mhz_read(void) return readl(versatile_sys_24mhz); } -static void __init versatile_sched_clock_init(struct device_node *node) +static int __init versatile_sched_clock_init(struct device_node *node) { void __iomem *base = of_iomap(node, 0); if (!base) - return; + return -ENXIO; versatile_sys_24mhz = base + SYS_24MHZ; sched_clock_register(versatile_sys_24mhz_read, 32, 24000000); + + return 0; } -CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg", +CLOCKSOURCE_OF_DECLARE_RET(vexpress, "arm,vexpress-sysreg", versatile_sched_clock_init); -CLOCKSOURCE_OF_DECLARE(versatile, "arm,versatile-sysreg", +CLOCKSOURCE_OF_DECLARE_RET(versatile, "arm,versatile-sysreg", versatile_sched_clock_init);