From patchwork Thu Jun 16 21:26:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9181661 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 E9E9E60776 for ; Thu, 16 Jun 2016 21:31:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9B9F208C2 for ; Thu, 16 Jun 2016 21:31:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE82328365; Thu, 16 Jun 2016 21:31:27 +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=-1.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, SUSPICIOUS_RECIPS, T_DKIM_INVALID autolearn=no 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 97CAA208C2 for ; Thu, 16 Jun 2016 21:31:27 +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 1bDerR-0004V4-0M; Thu, 16 Jun 2016 21:30:01 +0000 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bDeq9-000317-Ve for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2016 21:28:44 +0000 Received: by mail-wm0-x230.google.com with SMTP id f126so66401458wma.1 for ; Thu, 16 Jun 2016 14:28:23 -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=9gp0htQCd3PCZwgSrrJIKcp/b+Kj8T2dFjcRJpS/htQ=; b=eEVb3RVAGr2tLONMaEzTLoGobrWwrazdtEh4CgbxyyPh27tzcXgT09t8R+qxEHCuwW B8xwVaKxlZGJy5l2feZ6kaiZFl1eTyb00FkArpCCfNqo3K4t5dx/nVs+5Gn91/LM8Ya6 49KncK1bVh3BPUbUFZVBP5Oj+x0QuGEH24Lhk= 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=9gp0htQCd3PCZwgSrrJIKcp/b+Kj8T2dFjcRJpS/htQ=; b=bGQy+hnxx6EAxj/lTVICvpc1ZPDgqJe0n2BePzEnoV3ZX+vEqWzAHmJ4+xpacMzMDx onRVR9oHW+ixyPnD5ZOq4PpdDfcicXjmCW9Ruzc4UVVPgh+Vh+/RG4mDb4ZiTwHfWVaP TvYkXaYijHOpZyoD9kKA61YmAQL68rXEPzzL1Fb1XsOBvcGCVG3rSIa6wYIBo/AN6Siz 0KdS50wFVhdIHnCWUH9YGXTK8MfFxgpHxv9DfmbMX8T9TsUubESLIYONlJMuw2drMhJl azDNPSyDHjFFw23ZjL8xXQ8ktTdItpV9uO204DcI7Lo4CKqiM7WqpNB8veRKtjvUoNZd w6hA== X-Gm-Message-State: ALyK8tKCV/xDmpy6dhW7UggIrW3g1HmQNtl4lu3jZtQSJofa35BXszER4cZ6d9WQnsZNgL2q X-Received: by 10.28.152.202 with SMTP id a193mr17707289wme.98.1466112502237; Thu, 16 Jun 2016 14:28:22 -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.28.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Jun 2016 14:28:21 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH V2 15/63] clocksource/drivers/clksrc-dbx500: Convert init function to return error Date: Thu, 16 Jun 2016 23:26:34 +0200 Message-Id: <1466112442-31105-16-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_142842_382195_66195D99 X-CRM114-Status: GOOD ( 12.73 ) 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: Linus Walleij , linux-kernel@vger.kernel.org, "moderated list:ARM/Ux500 ARM ARC..." 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: Linus Walleij --- drivers/clocksource/clksrc-dbx500-prcmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c index dfad6eb..5a59d29 100644 --- a/drivers/clocksource/clksrc-dbx500-prcmu.c +++ b/drivers/clocksource/clksrc-dbx500-prcmu.c @@ -64,7 +64,7 @@ static u64 notrace dbx500_prcmu_sched_clock_read(void) #endif -static void __init clksrc_dbx500_prcmu_init(struct device_node *node) +static int __init clksrc_dbx500_prcmu_init(struct device_node *node) { clksrc_dbx500_timer_base = of_iomap(node, 0); @@ -84,7 +84,7 @@ static void __init clksrc_dbx500_prcmu_init(struct device_node *node) #ifdef CONFIG_CLKSRC_DBX500_PRCMU_SCHED_CLOCK sched_clock_register(dbx500_prcmu_sched_clock_read, 32, RATE_32K); #endif - clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); + return clocksource_register_hz(&clocksource_dbx500_prcmu, RATE_32K); } -CLOCKSOURCE_OF_DECLARE(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", +CLOCKSOURCE_OF_DECLARE_RET(dbx500_prcmu, "stericsson,db8500-prcmu-timer-4", clksrc_dbx500_prcmu_init);