From patchwork Mon Aug 25 00:36:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 35891 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9F7C3203C0 for ; Mon, 25 Aug 2014 10:02:37 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf111615547pad.6 for ; Mon, 25 Aug 2014 03:02:35 -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=W+zOYX70TaAFKhSV1J0DIpVLgM7XbrshW5hKkE5Zk14=; b=jy/2xV3vWSIIdLeGjm++mWscm3Xmfxub38H9JfF6O7D1Au8QVUayjleUCUxWeKKXpo GxShE6iTx4qmKJxtV05rZE8CFeHFDLYQtbnZyitQI2ZxuZlhK2Kb9L5V1jutcl3kq3YW GqUXK+BfxroZO3UNFDZPY8O3OrJ0kNPgDWkyLO3CteujRMw5nJln/OESSsIanVaBTpWT 0RvLZwYOtr2AtM3g7+CGtbUKBO5/sFTRhRYrQAGF6HXTR1stVE99HFELh9r9v4hIT9Em /fBbp/rJOag7bpxdkAsOgE9j8yM0GJV790LTY0IyqemseODy4Knu653l/pWxViJb+inJ pulQ== X-Gm-Message-State: ALoCoQk6LK9BLy9K0W6AkZipk1As/UCa1UQDha1Oh1F0YLya2/fSv4fALcM3rLSnmtmty3Chw8Ba X-Received: by 10.66.66.3 with SMTP id b3mr13196237pat.6.1408960955667; Mon, 25 Aug 2014 03:02:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.133 with SMTP id c5ls2099971qga.38.gmail; Mon, 25 Aug 2014 03:02:35 -0700 (PDT) X-Received: by 10.220.132.207 with SMTP id c15mr11374111vct.12.1408960955490; Mon, 25 Aug 2014 03:02:35 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id sd9si17105778vdb.25.2014.08.25.03.02.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 25 Aug 2014 03:02:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so14700371vcb.20 for ; Mon, 25 Aug 2014 03:02:35 -0700 (PDT) X-Received: by 10.220.49.10 with SMTP id t10mr5521026vcf.34.1408960955383; Mon, 25 Aug 2014 03:02:35 -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.221.45.67 with SMTP id uj3csp104651vcb; Mon, 25 Aug 2014 03:02:34 -0700 (PDT) X-Received: by 10.68.134.130 with SMTP id pk2mr9672045pbb.133.1408960954532; Mon, 25 Aug 2014 03:02:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rf10si52660568pab.76.2014.08.25.03.02.32 for ; Mon, 25 Aug 2014 03:02:32 -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 S1754579AbaHYKCb (ORCPT + 15 others); Mon, 25 Aug 2014 06:02:31 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:60191 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751540AbaHYKCb (ORCPT ); Mon, 25 Aug 2014 06:02:31 -0400 Received: from cpc11-sgyl31-2-0-cust672.sgyl.cable.virginm.net ([94.175.94.161] helo=finisterre) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1XLr61-0005AI-RT; Mon, 25 Aug 2014 10:01:58 +0000 Received: from broonie by finisterre with local (Exim 4.84_RC1) (envelope-from ) id 1XLiGr-0003GG-TD; Sun, 24 Aug 2014 19:36:29 -0500 From: Mark Brown To: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse Cc: linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, Mark Brown Date: Sun, 24 Aug 2014 19:36:29 -0500 Message-Id: <1408926989-12501-1-git-send-email-broonie@kernel.org> X-Mailer: git-send-email 2.1.0.rc1 X-SA-Exim-Connect-IP: 94.175.94.161 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=-1.4 required=5.0 tests=ALL_TRUSTED,BAYES_00, DATE_IN_PAST_06_12 autolearn=no 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.220.175 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;