From patchwork Tue Aug 5 01:48:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guenter Roeck X-Patchwork-Id: 4675061 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 5B6189F38C for ; Tue, 5 Aug 2014 01:51:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 850EB2014A for ; Tue, 5 Aug 2014 01:51:56 +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 BCB1C20160 for ; Tue, 5 Aug 2014 01:51:55 +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 1XETt6-0008JN-4N; Tue, 05 Aug 2014 01:50:04 +0000 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XETsi-0007f5-KG for linux-arm-kernel@lists.infradead.org; Tue, 05 Aug 2014 01:49:41 +0000 Received: by mail-pa0-f42.google.com with SMTP id lf10so382433pab.15 for ; Mon, 04 Aug 2014 18:49:18 -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=NItlXHVo25BSmiH1L2YAT1U9/A9vliUQRH1M4kkDIb0=; b=bilR6nHcMm334wcs+U6GPOfWLlnbuV5UOdvLSZzSexwky83Wh03GzKehl5IcuHOpC+ aqoWWVLWjGp+Ul3DsSZQvZA8amITjveFc0BcIGRSRRNZupv26OY/DsxFlnp8uAJQ4jBd 5AOVacPbzmlpak+3s+Erp3XxROmhBuP2/ozJmLM5FMxQSxCANKcYuQVhHAUI83guIXj+ cpgQOe9NHC2nz0OCsxuQDaZuidv1W7m+7BJDQXf36VLH7ymhrey4ccswJO53ZysNbHub +X9CzdOCqlbPb6R9ON12A/36d1voNnYy1s2yBWFmDKLMes6pQbBPhNWg9jyR+7vTI8aV G9Yg== X-Received: by 10.70.140.139 with SMTP id rg11mr561810pdb.13.1407203358708; Mon, 04 Aug 2014 18:49:18 -0700 (PDT) Received: from localhost (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by mx.google.com with ESMTPSA id ee5sm172167pbc.47.2014.08.04.18.49.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 18:49:18 -0700 (PDT) From: Guenter Roeck To: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 4/7] power/restart: Call machine_restart instead of arm_pm_restart Date: Mon, 4 Aug 2014 18:48:55 -0700 Message-Id: <1407203338-12915-5-git-send-email-linux@roeck-us.net> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407203338-12915-1-git-send-email-linux@roeck-us.net> References: <1407203338-12915-1-git-send-email-linux@roeck-us.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140804_184940_701181_6C89AD14 X-CRM114-Status: GOOD ( 12.02 ) 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.5 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 Acked-by: Catalin Marinas Acked-by: Heiko Stuebner --- 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 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)