From patchwork Wed Sep 17 18:34:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 37536 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 30C512057E for ; Wed, 17 Sep 2014 18:35:13 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id cc10sf910011wib.1 for ; Wed, 17 Sep 2014 11:35:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:date :message-id:subject:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=pytqHG4rS1DcnmuU3SwzswxkwRpZhJfdN16VLQ21jJs=; b=mKqcfxlJjqlYr5xGbhh17SeRCZF/87ZyQRK1WAcQt0wT0EtpZdbYSXxfc3F2+vqNNw 8itG8ckLaosJC3KdB7NLYAM1pCRN4VLZvUVxCWIm8tk3lKA+8RPgcq74q9n7TKrdyaWy 4lm1GpMgyfZ0ustgeztYDAXYmMmumVwc22Dsc6KErK9R9q4hztSoQh/yYC0cKkTsN02c vZ/3Q1jHBORuWJNs0NfxQMrjJ9EDj6GMcYUe/FmPNVg4wXCbTn4NUkAjAixtOXDsIedu pGFPpdg008GJA1ccUVsO86G9IPJNEFYJ25bsY+2j0XdfjY+zxSinUmTmPm/niKyWsPEz oJ9w== X-Gm-Message-State: ALoCoQmwbd3trSis9PdvHPc7fyISx4IgRP9zwuB5tSQqfFqt6PBi81NGmNKQbSGD0+Xn2jnsLlu8 X-Received: by 10.112.137.230 with SMTP id ql6mr214341lbb.13.1410978912295; Wed, 17 Sep 2014 11:35:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.167 with SMTP id z7ls136940laj.95.gmail; Wed, 17 Sep 2014 11:35:12 -0700 (PDT) X-Received: by 10.152.87.193 with SMTP id ba1mr21151509lab.83.1410978912164; Wed, 17 Sep 2014 11:35:12 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com [209.85.215.46]) by mx.google.com with ESMTPS id o5si21450982lao.127.2014.09.17.11.35.12 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Sep 2014 11:35:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id el20so2439529lab.19 for ; Wed, 17 Sep 2014 11:35:12 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr43903458lac.44.1410978912096; Wed, 17 Sep 2014 11:35:12 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp634280lbb; Wed, 17 Sep 2014 11:35:11 -0700 (PDT) X-Received: by 10.66.157.73 with SMTP id wk9mr566220pab.101.1410978910480; Wed, 17 Sep 2014 11:35:10 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vx2si4106303pbc.67.2014.09.17.11.35.09 for ; Wed, 17 Sep 2014 11:35:10 -0700 (PDT) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756089AbaIQSe6 (ORCPT + 15 others); Wed, 17 Sep 2014 14:34:58 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:48497 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755827AbaIQSe5 (ORCPT ); Wed, 17 Sep 2014 14:34:57 -0400 Received: from 70-35-38-154.static.wiline.com ([70.35.38.154] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XUK3s-0000zy-9c; Wed, 17 Sep 2014 18:34:45 +0000 Received: from broonie by finisterre with local (Exim 4.84) (envelope-from ) id 1XUK3g-0007oH-Ie; Wed, 17 Sep 2014 11:34:28 -0700 From: Mark Brown To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, akpm@linux-foundation.org, Mark Brown Date: Wed, 17 Sep 2014 11:34:19 -0700 Message-Id: <1410978859-29986-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.1.0 X-SA-Exim-Connect-IP: 70.35.38.154 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mezzanine.sirena.org.uk X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham version=3.3.2 Subject: [PATCH] power/reset: xgene-reset: Fix prototype of xgene_restart() X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: broonie@kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Mark Brown 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 --- 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 ecd55f8..6b49be6 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;