From patchwork Thu Jun 16 21:27:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9181737 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 BB2B860776 for ; Thu, 16 Jun 2016 21:38:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD41E27B13 for ; Thu, 16 Jun 2016 21:38:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A223C2838A; Thu, 16 Jun 2016 21:38:46 +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 36ACD27B13 for ; Thu, 16 Jun 2016 21:38:46 +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 1bDeyW-0007dw-Cz; Thu, 16 Jun 2016 21:37:20 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDerI-0003um-6d for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 21:29:57 +0000 Received: by mail-wm0-x22e.google.com with SMTP id m124so86985369wme.1 for ; Thu, 16 Jun 2016 14:29:32 -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=gJkxpK0TK/+VskAmRC7yqV9zUy82DZvs0xS3MDjQdAE=; b=DPZkqdwuzMUwoSeoouCfAwkOUNtFTnJUC2Xq+GBk/Vhh/FKV/kncFypkyNTFfiT26k nM8+DQDeuyN4jKOIh3mA/cthbGI0BAuSSncv6qGKnKTN1jefZ49hkDWIn2dD04/TFWvI tUeQt24122IrTaA2rjSc6NvZrnw2VzWw/oAPw= 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=gJkxpK0TK/+VskAmRC7yqV9zUy82DZvs0xS3MDjQdAE=; b=GCmwM6j2KSuXUO/Y9w+20ZsQZGnkIiD+uzeYQICMmlfJ3ne4+v6gB2OBnnG7G6F9KP OwPb6PICUw/w/1nazL+od6NZOwcfOt/ZBfx7/dmHFQbJpeybkSjkjf1QEHKFoutrP5f3 33vkVDekMIXi4CZ3UMggD7WrGsoBhNz8QMj6dENg4MNCK/xrqJwgbpWvPQkZ9jDOJgbW Rrs8IJhetj2IjWoP72XRdaOvretroBBO8KoBkKbGLbWcbQ+Tr4lt9HwZ9KQPQaQgKxAx xD96swodXRfoGCCnl7ftwnja/UxJ4bk0QACWCmAyYW89UJGh6y9UCIZikz8N0E7E2Rwr Lnyw== X-Gm-Message-State: ALyK8tJchgUJQPH3BkkCjOpiNF5CHgFlR7XZoSlNrKOt8vnzbq0Pac7cUdF0QbOa61aQEktV X-Received: by 10.194.95.74 with SMTP id di10mr1519435wjb.52.1466112570687; Thu, 16 Jun 2016 14:29:30 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:29:30 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH V2 59/63] clocksource/drivers/smp_twd: Convert init function to return error Date: Thu, 16 Jun 2016 23:27:18 +0200 Message-Id: <1466112442-31105-60-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_142953_026155_609EB495 X-CRM114-Status: GOOD ( 13.04 ) 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: Viresh Kumar , linux-kernel@vger.kernel.org, Felipe Balbi , Russell King , "moderated list:ARM PORT" , Marc Gonzalez 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 --- arch/arm/kernel/smp_twd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 1bfa7a7..2b24be4 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -390,7 +390,7 @@ int __init twd_local_timer_register(struct twd_local_timer *tlt) } #ifdef CONFIG_OF -static void __init twd_local_timer_of_register(struct device_node *np) +static int __init twd_local_timer_of_register(struct device_node *np) { int err; @@ -410,8 +410,9 @@ static void __init twd_local_timer_of_register(struct device_node *np) out: WARN(err, "twd_local_timer_of_register failed (%d)\n", err); + return err; } -CLOCKSOURCE_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); -CLOCKSOURCE_OF_DECLARE(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); -CLOCKSOURCE_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); +CLOCKSOURCE_OF_DECLARE_RET(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); +CLOCKSOURCE_OF_DECLARE_RET(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); +CLOCKSOURCE_OF_DECLARE_RET(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); #endif