From patchwork Tue Jun 28 10:31:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71019 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1511014qgy; Tue, 28 Jun 2016 03:37:44 -0700 (PDT) X-Received: by 10.98.33.138 with SMTP id o10mr488475pfj.151.1467110264419; Tue, 28 Jun 2016 03:37:44 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x129si33041532pfb.98.2016.06.28.03.37.44; Tue, 28 Jun 2016 03:37:44 -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 S1753193AbcF1KhS (ORCPT + 30 others); Tue, 28 Jun 2016 06:37:18 -0400 Received: from mail-wm0-f51.google.com ([74.125.82.51]:36462 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987AbcF1Kec (ORCPT ); Tue, 28 Jun 2016 06:34:32 -0400 Received: by mail-wm0-f51.google.com with SMTP id f126so133941691wma.1 for ; Tue, 28 Jun 2016 03:34: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=fJyM8yZ+eBSAFbeLJ7z7wqKrCSdDu2GU/d3LiMpQ+GYuWmF2w4nJZ3NleRo8XJye59 ET1Cmy1A+ZPyGScHGfmQtibz3NztBPE5bujdmFgnaCMN1kal2T5/DMKmnY/c8c98MYql 81YVB1FDhiRZ1Ia3pIB3gFEUQp+lRN9ZyvX/8= 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=S42qAM7ks/ReAj+WQpm/iEs6A0ov1T14E3X5CYD9viDiOrXPR/qJuKi/6kTVWUEsBw znGTrcm6ykYANYer6bJuRjdfQzyaMPNcYZTFWLfSsW0hStI0b8Ycg1fDCrlSF12EfVGb Py7s1I+H6i7yxpvJFbHU2EkmnhiDe2hhDHW9ryrZ6nUbr6HrluJ+bUMP4ne+z1KEHfQa qRTJLXQRRf5dfx/PPojqg89sAvqF/jZjFTIp8y8/xC50NksC1rHDDMIoqDD21i33KHH2 IX1YtBCUN0HYHrojzHNq9z2h+37AbiU2A0P48zuftS1nJp+Bq65NHdKL2bK2/3OzgYCz gXTQ== X-Gm-Message-State: ALyK8tI9koNF7XQ6/GS0JOgDu4nh1SCR130stYz+s7RdRAdAOr+Dxw8hTfDPo3g2NGdcmbi/ X-Received: by 10.194.81.166 with SMTP id b6mr2528791wjy.81.1467110071318; Tue, 28 Jun 2016 03:34:31 -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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:34:30 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 68/92] clocksource/drivers/smp_twd: Convert init function to return error Date: Tue, 28 Jun 2016 12:31:27 +0200 Message-Id: <1467109911-11060-68-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 --- arch/arm/kernel/smp_twd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 1.9.1 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