From patchwork Fri May 5 19:46:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98665 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292685qge; Fri, 5 May 2017 12:48:19 -0700 (PDT) X-Received: by 10.98.43.13 with SMTP id r13mr18684483pfr.32.1494013699426; Fri, 05 May 2017 12:48:19 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.19; Fri, 05 May 2017 12:48:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755493AbdEETsR (ORCPT + 6 others); Fri, 5 May 2017 15:48:17 -0400 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 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0MZKwe-1dKxjo3U3o-00KvK5; Fri, 05 May 2017 21:48:08 +0200 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> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:wjdh1OO/8S6fvCauu8mC7L+rLHszY4iiH6XEros5w9ymbcoST+2 TGsn0wEd1LP5ujV9ernDSMbLTSguBcGO7CZ/Q+I2yoswqAA8kVdwJpBmgiKg5/B8M7MlAQs i6pMo2imtX+H+xD/lPmXAhaH2fEkpKkAfIC8BDG+5UPldFjsCx1gs4gU6sh43MHZGSX4hHq n6t8K6Nb7qZDQDVvEIXcQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Kgf8peGDY0Y=:f9MGxCZIiNZ/Nqevz/s+8K g5bmsFLN9PYlSF6jBEzJrI3T/7IlghNxy2pvy7wy0E8+UpJ1QnULJvQJbUxTHnAnKqGP9J73d QwD7lgtlDeJMZcfLfIpDLM4BdK/+lKPP4KEQwNFDyiuhQMCAjrm5wmC4mPvliArQPWBAuBs9G g3naqQSHCerr1nESx4TTaikfBvhdGVBBXiw3+6OxhrC2Jja3j8RNb61YDIVz9ikLFqTG8VF61 Ud5Dmxfat/zPTxqHYdFp10i1tEnWb4vM8pgRN7HIFCS7CJeuJkbFuw0mYCEj2hFTW+G3dv8HL 0RDK52zfP3CtczwKjPvn4ohyZm2B4+7Yg+Rwr9Vd7Ufx7j9FliBeBWbmpjYLe1V0oTf/vUCeR Bd/OETGXMSbx+VyTgRgaR0lgQedn9WNrN016BZK9EpeZKWhiPYByhFQOe8F32JadZiaHGfu7c /Dbhx4P4BGgPzSjDebWrLQk6d7dPUc6kjHk1nFTjjXG35biM3SfTQEQ6Q8ugC57ZYVoabl5xK 0aTKuK1njYliuxpfaOuG7+5vCQeF8hMNAtdTFZVZgAMUCp9kXUdV5YxBzmiRgwvvyc8tcPpD9 Hvr8YwYIRp+YUJdkqboMTRxkyp2MqqAZnMzDuT3DO3jl8RaPpYHFbzmFLxrNYw9utlC2m/XJT VNnwnyXEOb16ZqGapJahhxmCU2nAsGqT61U2/PE7HxawsFgOmKjCmZ8v1/sgQLsQOICE= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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(-) -- 2.9.0 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;