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: 71001 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1509763qgy; Tue, 28 Jun 2016 03:34:46 -0700 (PDT) X-Received: by 10.66.155.167 with SMTP id vx7mr486773pab.125.1467110086141; 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.45; 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 S1752961AbcF1KeY (ORCPT + 30 others); Tue, 28 Jun 2016 06:34:24 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:36903 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbcF1KeT (ORCPT ); Tue, 28 Jun 2016 06:34:19 -0400 Received: by mail-wm0-f42.google.com with SMTP id a66so20970488wme.0 for ; Tue, 28 Jun 2016 03:34:18 -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=aSelaDOI4+z7oMHvyDSqzCX/LTYqvRLUytxab6ZzJ0XWtcsoFqpoVJNW8/Fm/GITYo THk+TKD4R3a53svaGkYHgaO8S0iyo+7fb9VHJTIb0uCgIvAn/fpPbDCTqH3tJAbQ2dzI zBJ/cSsc4MoZF9XH7GLDCdgGunI48IlCWT40Pc5aRtsjOdlfg5RGTY7c5/2EzVcmkb3W NqRy34dSGXb2HUy+AmVjXhYovuRxhAE4bTe12ACxYgd0GLQvjybnEBDZGarHkNphMsJQ JPWTHXNUrwyMMhLXeswNOUMMO5O5J3/oxKTrw/xkRzmsz492KdLGpFFDK62Lkda2PA0k Dc0g== X-Gm-Message-State: ALyK8tJS3JB/4MZX6MQ89ryToqV7CPxKNPyHrRz8dZroymrP2XFARIxvG81TE7FLtnLl4as0 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 Cc: linux-kernel@vger.kernel.org, Liviu Dudau , linux-arm-kernel@lists.infradead.org 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> 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: Liviu Dudau --- drivers/clocksource/versatile.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 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);