From patchwork Wed Aug 20 00:45:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4747111 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E39C09F377 for ; Wed, 20 Aug 2014 00:49:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70E812015E for ; Wed, 20 Aug 2014 00:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7CDC920155 for ; Wed, 20 Aug 2014 00:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752083AbaHTAp7 (ORCPT ); Tue, 19 Aug 2014 20:45:59 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:59245 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751647AbaHTAp4 (ORCPT ); Tue, 19 Aug 2014 20:45:56 -0400 Received: by mail-pd0-f176.google.com with SMTP id y10so10603112pdj.7 for ; Tue, 19 Aug 2014 17:45:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JgtDquGZo23Yt4Cwu1Fm+tkcfezr/o2DyW9x2Qtb6bw=; b=nBALRejlehssbaZfQtkWKDHRgnpDliNcLH6ONShyDv+bNtCCMH/LOK2VZQ3e13bhGR 7vJskqXh3BQGeLsIDFP/+Ldf3U9wqdv0i2ceiosXeHmgytLtdRdt/w5gyDy/Q/lkOp9b vQit1J6ZxZLyCv3A2lwNUs4HfF9389VGjm5rqvo0ep44CS7g83g8g5oV0JUOPUoIb3lH uSb5WoHL/gRzqYb/m356dwEq0su2bNYNSLH5DdovcRnsqGRswWk3jg09MkyVBlTGhyTP 571Frr7kOc1HmcMy7qATgzEHlnb9p7q+71a3NscuHpk43qWk2XgjQP9kdHizNa4FaQus vstA== X-Received: by 10.66.66.166 with SMTP id g6mr47824042pat.108.1408495555475; Tue, 19 Aug 2014 17:45:55 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id zh7sm74317894pab.1.2014.08.19.17.45.53 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 19 Aug 2014 17:45:54 -0700 (PDT) From: Guenter Roeck To: Russell King , Wim Van Sebroeck , Catalin Marinas , Maxime Ripard , Andrew Morton Cc: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Will Deacon , Arnd Bergmann , Heiko Stuebner , Jonas Jensen , Randy Dunlap , Steven Rostedt , Ingo Molnar , Dmitry Eremin-Solenikov , David Woodhouse , Tomasz Figa , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Guenter Roeck Subject: [PATCH v7 02/11] power/restart: Call machine_restart instead of arm_pm_restart Date: Tue, 19 Aug 2014 17:45:29 -0700 Message-Id: <1408495538-27480-3-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408495538-27480-1-git-send-email-linux@roeck-us.net> References: <1408495538-27480-1-git-send-email-linux@roeck-us.net> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP machine_restart is supported on non-ARM platforms, and and ultimately calls arm_pm_restart, so dont call arm_pm_restart directly but use the more generic function. Cc: Russell King Signed-off-by: Guenter Roeck Acked-by: Catalin Marinas Acked-by: Heiko Stuebner Reviewed-by: Doug Anderson Tested-by: Doug Anderson Acked-by: Sebastian Reichel --- v7: No change. v6: No change. v5: No change. v4: No change. v3: No change. v2: Added patch. drivers/power/reset/restart-poweroff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c index 3e51f8d..edd707e 100644 --- a/drivers/power/reset/restart-poweroff.c +++ b/drivers/power/reset/restart-poweroff.c @@ -20,7 +20,8 @@ static void restart_poweroff_do_poweroff(void) { - arm_pm_restart(REBOOT_HARD, NULL); + reboot_mode = REBOOT_HARD; + machine_restart(NULL); } static int restart_poweroff_probe(struct platform_device *pdev)