From patchwork Tue Jun 28 10:31:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9202687 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 4891760757 for ; Tue, 28 Jun 2016 10:39:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38C62285F2 for ; Tue, 28 Jun 2016 10:39:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DC52285F6; Tue, 28 Jun 2016 10:39:26 +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 B5D01285F2 for ; Tue, 28 Jun 2016 10:39:25 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHqOo-0004Tj-Im; Tue, 28 Jun 2016 10:37:46 +0000 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHqLn-0007Dv-JH for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2016 10:34:42 +0000 Received: by mail-wm0-x22c.google.com with SMTP id a66so20970487wme.0 for ; Tue, 28 Jun 2016 03:34:19 -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=FAA+Rz7M6AQ/agEGd8Hz10etpfqiH1bq52kY3L/SQEM=; b=bn8Xpf+aRVin1C4yw/H5gdl7KNtAFDBsH6iK8+4hn2qx8VKw7Om6JqD5DzsNunjtGk HfzJT5I1vV1U0T5D1BDK+YrQZkSq3i5MW3Otp3VcSjS41rgGE9qglqeTQAnhZ4lSmUWG N6HToEVVoJ1H9u+cnWWzLBTGgr9bDoVwvUz4E= 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=FAA+Rz7M6AQ/agEGd8Hz10etpfqiH1bq52kY3L/SQEM=; b=kYhpACCY4uUgY2KYk2naRHerq/o8Pq7XYMDi6crq/32gOKBn6iqTwVQBxlTYHqYjB/ AgY/RQk6S6aFXNckkOkDS/AEbOcWizBKyrGesiLHpL6EdLS4Ehs/NEL81IMC+ciqGggm XTTCPILZuavheUJ2DkDoRIwyhc84/oQp/ltIdUTrZe2yqReHiuBPxj+nfGqhmid8xwmH wEUHnfgZKMyHRPS4+aUWLHfjxAxn7KxTgeQaEihdLmwKpfjve3478ia8b4J4YnhCvcSb s/mKjKIg/gQGMt3eqX4U+DPgY3/UxyOC/vphVONaNZDg/TcdXrdYWqWe74joOhAltlgX irpQ== X-Gm-Message-State: ALyK8tIjMQuI2pEQxjxHiSL+48nCRpM2/hacwQ/jrsJcDgNtsJVRctgsQZmm4G4Li0qGIUgC X-Received: by 10.194.123.166 with SMTP id mb6mr2538182wjb.94.1467110058190; Tue, 28 Jun 2016 03:34:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:17 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH 61/92] clocksource/drivers/versatile: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:20 +0200 Message-Id: <1467109911-11060-61-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160628_033440_191015_A31A4878 X-CRM114-Status: GOOD ( 13.56 ) 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: Liviu Dudau , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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);