From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758741AbbCDOXM (ORCPT ); Wed, 4 Mar 2015 09:23:12 -0500 Received: from down.free-electrons.com ([37.187.137.238]:47205 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758407AbbCDOVs (ORCPT ); Wed, 4 Mar 2015 09:21:48 -0500 From: Alexandre Belloni To: Nicolas Ferre , Daniel Lezcano Cc: Boris Brezillon , Jean-Christophe Plagniol-Villard , Thomas Gleixner , Lee Jones , Wim Van Sebroeck , Guenter Roeck , Sebastian Reichel , Dmitry Eremin-Solenikov , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, linux-pm@vger.kernel.org, Alexandre Belloni Subject: [PATCH v3 5/9] ARM: at91: at91rm9200: remove deprecated arm_pm_restart Date: Wed, 4 Mar 2015 15:21:33 +0100 Message-Id: <1425478897-27322-6-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425478897-27322-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1425478897-27322-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that a proper driver is available, remove at91rm9200_restart. Signed-off-by: Alexandre Belloni --- arch/arm/mach-at91/at91rm9200.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 8fcfb70f7124..2386d08d65e8 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -24,19 +24,8 @@ #include #include -#include - #include "generic.h" -static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd) -{ - /* - * Perform a hardware reset with the use of the Watchdog timer. - */ - at91_st_write(AT91_ST_WDMR, AT91_ST_RSTEN | AT91_ST_EXTEN | 1); - at91_st_write(AT91_ST_CR, AT91_ST_WDRST); -} - static void __init at91rm9200_dt_timer_init(void) { of_clk_init(NULL); @@ -48,7 +37,6 @@ static void __init at91rm9200_dt_device_init(void) of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); arm_pm_idle = at91rm9200_idle; - arm_pm_restart = at91rm9200_restart; at91rm9200_pm_init(); } -- 2.1.0