From patchwork Thu Jul 7 08:01:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9218219 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 D2BB96048B for ; Thu, 7 Jul 2016 08:09:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6D5A24B5E for ; Thu, 7 Jul 2016 08:09:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBB49285A6; Thu, 7 Jul 2016 08:09:13 +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 3626B24B5E for ; Thu, 7 Jul 2016 08:09:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bL4L0-000288-MD; Thu, 07 Jul 2016 08:07:10 +0000 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bL4Hi-0004hm-Mh for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2016 08:03:49 +0000 Received: by mail-wm0-x22a.google.com with SMTP id n127so5805534wme.1 for ; Thu, 07 Jul 2016 01:03:26 -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=SBWxGOj2I4cWuSL67+7XYOQB6D336F2We7ZqHLLqOzI=; b=Y1oQhxo/xebcKC0FjjKqfCwvThwJRY4q4mlInbDR9um/OUBWlixEshZMpJo0AXElqn FC6DHaeNJMidwx+cIho2M5ereaQfCSMwa0F2EgF9jOTrp0R1IVBSFlHTCSd9TMX5eXzs 3FUs7KTJM30Ejzh4A/CHvRHe/kN2bW9qx8PBY= 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=SBWxGOj2I4cWuSL67+7XYOQB6D336F2We7ZqHLLqOzI=; b=TlIrYBNKQ1EfyFEK9pEPci+ws00qg2WqDDJGAPPreDVnQ4mpr9TcpLnpkKjcYFXLbz ztZc8wVMzXEll14C/0zaFIu9vjsoYRpjv2n/HQ7eGpqkRgzF1gWD9WkOx1g2O2JQtqWu qyJU+TKcdbDcdimNt4ldw3503cemCwr4CFGa6b3DKbbdLMIMc1ufrgVnn/G7JcxfWgs4 LsH7LaKLoCEs64pGGCIjEb5Id7oKWZnnbv8urR5Hcr/L0HSpX7BxiEa0oZEMX1Hh5g7D DQQaxZ1XBM0MTk08+4CxpHvDLR7dMGmm7rj7wDOti3RFyYxW7eUCo4yASo9ImAupdq5g jk1w== X-Gm-Message-State: ALyK8tJeeAdODAdtdLXSePZaday/AIJOMOZt0rDxEToKVIUaN0pibhWTQME7rfkuhgk7fjIc X-Received: by 10.194.9.38 with SMTP id w6mr24036059wja.62.1467878605296; Thu, 07 Jul 2016 01:03:25 -0700 (PDT) Received: from localhost.localdomain (lft31-1-88-121-166-205.fbx.proxad.net. [88.121.166.205]) by smtp.gmail.com with ESMTPSA id v70sm51327wmf.18.2016.07.07.01.03.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 01:03:24 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Subject: [PATCH 35/93] clocksource/drivers/mps2-timer: Convert init function to return error Date: Thu, 7 Jul 2016 10:01:08 +0200 Message-Id: <1467878526-1238-35-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> References: <577E0BED.3020608@linaro.org> <1467878526-1238-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160707_010346_916368_61C3A27C X-CRM114-Status: GOOD ( 14.20 ) 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: Liviu Dudau , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: Liviu Dudau --- drivers/clocksource/mps2-timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/mps2-timer.c b/drivers/clocksource/mps2-timer.c index 3d33a5e..c303fa9 100644 --- a/drivers/clocksource/mps2-timer.c +++ b/drivers/clocksource/mps2-timer.c @@ -250,7 +250,7 @@ out: return ret; } -static void __init mps2_timer_init(struct device_node *np) +static int __init mps2_timer_init(struct device_node *np) { static int has_clocksource, has_clockevent; int ret; @@ -259,7 +259,7 @@ static void __init mps2_timer_init(struct device_node *np) ret = mps2_clocksource_init(np); if (!ret) { has_clocksource = 1; - return; + return 0; } } @@ -267,9 +267,11 @@ static void __init mps2_timer_init(struct device_node *np) ret = mps2_clockevent_init(np); if (!ret) { has_clockevent = 1; - return; + return 0; } } + + return 0; } -CLOCKSOURCE_OF_DECLARE(mps2_timer, "arm,mps2-timer", mps2_timer_init); +CLOCKSOURCE_OF_DECLARE_RET(mps2_timer, "arm,mps2-timer", mps2_timer_init);