From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([212.227.126.131]:56479 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755211AbdEETsO (ORCPT ); Fri, 5 May 2017 15:48:14 -0400 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Mark Brown , Sebastian Reichel , Arnd Bergmann Subject: [PATCH 3.16-stable 14/87] power/reset: xgene-reset: Fix prototype of xgene_restart() Date: Fri, 5 May 2017 21:46:32 +0200 Message-Id: <20170505194745.3627137-15-arnd@arndb.de> In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> Sender: stable-owner@vger.kernel.org List-ID: From: Mark Brown Commit 777ad00725f7c8629db4640b25e19dc9665bb62f upstream. The xgene-reset driver uses xgene_restart() as arm_pm_restart() but that function should take an enum reset_type as the first argument rather than a char. Fix this; the paramter is not referenced in the implementation. Signed-off-by: Mark Brown Signed-off-by: Sebastian Reichel Signed-off-by: Arnd Bergmann --- drivers/power/reset/xgene-reboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c index ecd55f81b9d1..6b49be6867ab 100644 --- a/drivers/power/reset/xgene-reboot.c +++ b/drivers/power/reset/xgene-reboot.c @@ -40,7 +40,7 @@ struct xgene_reboot_context { static struct xgene_reboot_context *xgene_restart_ctx; -static void xgene_restart(char str, const char *cmd) +static void xgene_restart(enum reboot_mode mode, const char *cmd) { struct xgene_reboot_context *ctx = xgene_restart_ctx; unsigned long timeout; -- 2.9.0