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: 70235 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp465363qgy; Thu, 16 Jun 2016 14:31:18 -0700 (PDT) X-Received: by 10.66.4.106 with SMTP id j10mr7465267paj.111.1466112678311; Thu, 16 Jun 2016 14:31:18 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ew7si11345838pac.50.2016.06.16.14.31.18; Thu, 16 Jun 2016 14:31:18 -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 S1755391AbcFPV3c (ORCPT + 30 others); Thu, 16 Jun 2016 17:29:32 -0400 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37193 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932273AbcFPV3M (ORCPT ); Thu, 16 Jun 2016 17:29:12 -0400 Received: by mail-wm0-f44.google.com with SMTP id a66so75560524wme.0 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=cXhDFscJjZU24X0LQZVgyRu3YDm5TyOydisfdJfqDcl85GRV2FDLpYGKMlgr9tYfgf iGu+3pBXuAMGtCQGVsHmhLxWLD94lWBgl8lFKRsxQkgWLiVMKG6ubkYaS+rFyGKw/A6Q BqfqgYbHN1ggB5X/oH0bHHWREzWwx/SrdYIP3S6+BlVRBmM7adMUiYcpJVd5nzKdkk9e YDsQ7YwBt2VY1Ez4Ga24NJjx/c6Fe/eL34WcV+Q8utQtGIeS98BUXyR+xGclb/DiEs69 kUF5kPd7ypPmhbdR8mKf+3Z5ifjLVUrEQORcQpZH+Grl1B6kGda2xRDqmzsYy2STMQqB fZvA== X-Gm-Message-State: ALyK8tKPIcMyXcQARHbns31c2ypilbC70iJ571B3JUGV/gokQAp5mCkXZRl+w8Vn7YNBobo1 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 Cc: linux-kernel@vger.kernel.org, Liviu Dudau , Sudeep Holla , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org (moderated list:ARM/VERSATILE EXP...) 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> 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/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);