From patchwork Wed Mar 13 20:14:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Horst Kronstorfer X-Patchwork-Id: 227351 X-Patchwork-Delegate: afleming@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 775D02C0090 for ; Thu, 14 Mar 2013 07:14:47 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6C1C24A18D; Wed, 13 Mar 2013 21:14:45 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id guLQaozS9s2t; Wed, 13 Mar 2013 21:14:45 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DB3674A186; Wed, 13 Mar 2013 21:14:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7747F4A186 for ; Wed, 13 Mar 2013 21:14:41 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fhPD0qE2pkNZ for ; Wed, 13 Mar 2013 21:14:40 +0100 (CET) X-policyd-weight: IN_SBL_XBL_SPAMHAUS=4.35 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from m3f4.kronos.net (178-190-71-171.adsl.highway.telekom.at [178.190.71.171]) by theia.denx.de (Postfix) with ESMTPS id 1C9CF4A17F for ; Wed, 13 Mar 2013 21:14:39 +0100 (CET) Received: from m3f4.kronos.net (m3f4.kronos.net [127.0.0.1]) by m3f4.kronos.net (8.14.6/8.14.6) with ESMTP id r2DKEbGt010396; Wed, 13 Mar 2013 21:14:37 +0100 Received: (from mabuze@localhost) by m3f4.kronos.net (8.14.6/8.14.6/Submit) id r2DKEZ6q010395; Wed, 13 Mar 2013 21:14:35 +0100 From: Horst Kronstorfer To: u-boot@lists.denx.de Date: Wed, 13 Mar 2013 21:14:05 +0100 Message-Id: <1363205645-10337-1-git-send-email-hkronsto@frequentis.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1363175243-12183-1-git-send-email-hkronsto@frequentis.com> References: <1363175243-12183-1-git-send-email-hkronsto@frequentis.com> Subject: [U-Boot] [PATCH v2] mpc85xx: Fix a compiler warning when CONFIG_WATCHDOG is turned on X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de cpu.c:288:2: warning: implicit declaration of function 'reset_85xx_watchdog' [-Wimplicit-function-declaration] Signed-off-by: Horst Kronstorfer --- Changes for v2: - Fix formatting - Fix checkpatch findings arch/powerpc/cpu/mpc85xx/cpu.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c index df2ab6d..6ce483e 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu.c +++ b/arch/powerpc/cpu/mpc85xx/cpu.c @@ -282,14 +282,6 @@ unsigned long get_tbclk (void) #if defined(CONFIG_WATCHDOG) void -watchdog_reset(void) -{ - int re_enable = disable_interrupts(); - reset_85xx_watchdog(); - if (re_enable) enable_interrupts(); -} - -void reset_85xx_watchdog(void) { /* @@ -297,6 +289,16 @@ reset_85xx_watchdog(void) */ mtspr(SPRN_TSR, TSR_WIS); } + +void +watchdog_reset(void) +{ + int re_enable = disable_interrupts(); + + reset_85xx_watchdog(); + if (re_enable) + enable_interrupts(); +} #endif /* CONFIG_WATCHDOG */ /*