From patchwork Wed Jul 9 03:38:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4511301 Return-Path: X-Original-To: patchwork-linux-arm@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 C6FFC9F39B for ; Wed, 9 Jul 2014 03:41:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D47720351 for ; Wed, 9 Jul 2014 03:41:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D87DB202BE for ; Wed, 9 Jul 2014 03:40:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4iim-00081X-I4; Wed, 09 Jul 2014 03:39:04 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4iiT-0007jF-Qr for linux-arm-kernel@lists.infradead.org; Wed, 09 Jul 2014 03:38:46 +0000 Received: by mail-pa0-f47.google.com with SMTP id kq14so8393486pab.20 for ; Tue, 08 Jul 2014 20:38:25 -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=4mRoK4vtgIoO7smy7XI3u4BphbqpynQXvFFsh6hvy+g=; b=urGYFAeNKTDwjgY/3uGWEa8BVkn6lbz0l/1SVpfLfUxpVBvXKcAWRORc1UMY86yS43 gciMqkKFSCOQIvpQJ+bHFA1WSfUWrPp/w++MV2n5dZxRXDPJCnBp0P7V9KmCv2k1Ktyj PR2DtK2SCE9BEOaoc3hPYNXnhdOIPVnmHkDjPoiIR8ij4y7BKjofQjodnp4jBrQv9Ja/ TDzzElLfM/TzArKApBUwNu4joMdHq5r1lO/c5Te42OMlS0hu6zG3qvK7ABadzx1PVfwZ aG5SCYsDP8srqU7jSYOFuVk3a3bBKKUQU9TLPqLP7vc5c5yfd5z3wOYXsjshZduL7NQe fusA== X-Received: by 10.70.0.48 with SMTP id 16mr9096315pdb.8.1404877105010; Tue, 08 Jul 2014 20:38:25 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id mj9sm842776pdb.44.2014.07.08.20.38.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 08 Jul 2014 20:38:24 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 4/7] power/restart: Call machine_restart instead of arm_pm_restart Date: Tue, 8 Jul 2014 20:38:00 -0700 Message-Id: <1404877083-6552-5-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404877083-6552-1-git-send-email-linux@roeck-us.net> References: <1404877083-6552-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140708_203845_904245_A86B43BB X-CRM114-Status: GOOD ( 12.11 ) X-Spam-Score: -0.4 (/) Cc: Ingo Molnar , Russell King , Heiko Stuebner , Arnd Bergmann , linux-doc@vger.kernel.org, Dmitry Eremin-Solenikov , Catalin Marinas , Tomasz Figa , Randy Dunlap , Will Deacon , linux-kernel@vger.kernel.org, Steven Rostedt , Jonas Jensen , Wim Van Sebroeck , Maxime Ripard , David Woodhouse , Andrew Morton , Guenter Roeck X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 --- 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 5758033..47f10eb 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)