From patchwork Tue Jun 28 10:30:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 71029 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp1511929qgy; Tue, 28 Jun 2016 03:40:20 -0700 (PDT) X-Received: by 10.66.254.196 with SMTP id ak4mr615144pad.62.1467110419585; Tue, 28 Jun 2016 03:40:19 -0700 (PDT) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 14si15761377pfz.229.2016.06.28.03.40.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 03:40:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org 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 1bHqQ7-0006Az-Op; Tue, 28 Jun 2016 10:39:07 +0000 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bHqL7-0006RR-Qj for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2016 10:33:59 +0000 Received: by mail-wm0-x232.google.com with SMTP id v199so133600240wmv.0 for ; Tue, 28 Jun 2016 03:33:37 -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=HD7OdKAJOILiJjCKtuv25j7Lb7MQSDsW4F5IOxhPOpqvRbD4+e+T0Dd+A4pw6YfAZJ vN7iz7d6vyzYXkAjHuhxDO6RBF4mqVeSA2DdM8uUGwfheAl5WpcqqEykPLvetXj8GkaY xb9s/tWrjcToi1OM85kfLHfTwaL/nGa+HWyD4= 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=I/K/afRFIkuVlJQhymRMCnJY3pRkVUdOOirnqJTsJAITlukgDAdrFpPnPRkgXdCdaB coUjBw6tsFvf+qaLr6lqJeSMPTzB3TBc3aGzrXEF81O1slZW6R+iL+Qgr+tC1TGj0CT8 Tb8haBh8jNYGXynOA2fo18C8FVZjAvLxOWNckUIWUB8cjRqBSM0J2JaSbri7PLUneBRM T/EUTFj9NZ3RYKTucjM/fgomT+pYDGu7q8uoCqPjJ9BK2gR7USYgEsusYoBvbZ/unT+S igTlZwF6s2Zen8mfKWFbvhYjBbgDMrgNaJ2yyOyvtwKI0uRacP3OPe1JtaJAKq0lPF+9 quYg== X-Gm-Message-State: ALyK8tKBnsArJkJJ1hULt6j+lpFVXMw4nA0+5TRx1DIGZTiXhZby1EwQn4mQDkRzQqw0ccw8 X-Received: by 10.28.71.74 with SMTP id u71mr2948061wma.0.1467110016360; Tue, 28 Jun 2016 03:33:36 -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.33.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 03:33:35 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, tglx@linutronix.de Subject: [PATCH 35/92] clocksource/drivers/mps2-timer: Convert init function to return error Date: Tue, 28 Jun 2016 12:30:54 +0200 Message-Id: <1467109911-11060-35-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160628_033358_165501_54EC769A X-CRM114-Status: GOOD ( 14.45 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:232 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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+patch=linaro.org@lists.infradead.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 Acked-by: Liviu Dudau --- drivers/clocksource/mps2-timer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 1.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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);