From: Greg Ungerer <gerg@uclinux.org>
Date: Tue, 24 Mar 2015 01:08:22 +0000 (+1000)
Subject: m68knommu: fix fec setup warning for ColdFire 5271 builds
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=6e4206136faa9a4d588946dfa604e1d989a9b3b6;p=deliverable%2Flinux.git

m68knommu: fix fec setup warning for ColdFire 5271 builds

Building for the ColdFire 5271 produces the following warning:

arch/m68k/coldfire/m527x.c: In function ‘m527x_fec_init’:
arch/m68k/coldfire/m527x.c:95:6: warning: unused variable ‘par’

Fix it by moving the definition of par inside the 5271 conditional code.

Reported-by: ertheb <3rth3bnospam@ethe.fr>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---

diff --git a/arch/m68k/coldfire/m527x.c b/arch/m68k/coldfire/m527x.c
index 2ba470735bed..c0b3e28f91df 100644
--- a/arch/m68k/coldfire/m527x.c
+++ b/arch/m68k/coldfire/m527x.c
@@ -92,7 +92,6 @@ static void __init m527x_uarts_init(void)
 
 static void __init m527x_fec_init(void)
 {
-	u16 par;
 	u8 v;
 
 	/* Set multi-function pins to ethernet mode for fec0 */
@@ -100,6 +99,8 @@ static void __init m527x_fec_init(void)
 	v = readb(MCFGPIO_PAR_FECI2C);
 	writeb(v | 0xf0, MCFGPIO_PAR_FECI2C);
 #else
+	u16 par;
+
 	par = readw(MCFGPIO_PAR_FECI2C);
 	writew(par | 0xf00, MCFGPIO_PAR_FECI2C);
 	v = readb(MCFGPIO_PAR_FEC0HL);