diff options
author | Greg Ungerer <gerg@uclinux.org> | 2015-03-23 21:08:22 -0400 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2015-03-29 19:52:24 -0400 |
commit | 6e4206136faa9a4d588946dfa604e1d989a9b3b6 (patch) | |
tree | 254081e8e3bc6895bb1fa41e5fc44fc7c4f94635 /arch/m68k/coldfire | |
parent | a630ec1b64c57f681877cc19c8e7ea5640cf7fcb (diff) |
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>
Diffstat (limited to 'arch/m68k/coldfire')
-rw-r--r-- | arch/m68k/coldfire/m527x.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) | |||
92 | 92 | ||
93 | static void __init m527x_fec_init(void) | 93 | static void __init m527x_fec_init(void) |
94 | { | 94 | { |
95 | u16 par; | ||
96 | u8 v; | 95 | u8 v; |
97 | 96 | ||
98 | /* Set multi-function pins to ethernet mode for fec0 */ | 97 | /* Set multi-function pins to ethernet mode for fec0 */ |
@@ -100,6 +99,8 @@ static void __init m527x_fec_init(void) | |||
100 | v = readb(MCFGPIO_PAR_FECI2C); | 99 | v = readb(MCFGPIO_PAR_FECI2C); |
101 | writeb(v | 0xf0, MCFGPIO_PAR_FECI2C); | 100 | writeb(v | 0xf0, MCFGPIO_PAR_FECI2C); |
102 | #else | 101 | #else |
102 | u16 par; | ||
103 | |||
103 | par = readw(MCFGPIO_PAR_FECI2C); | 104 | par = readw(MCFGPIO_PAR_FECI2C); |
104 | writew(par | 0xf00, MCFGPIO_PAR_FECI2C); | 105 | writew(par | 0xf00, MCFGPIO_PAR_FECI2C); |
105 | v = readb(MCFGPIO_PAR_FEC0HL); | 106 | v = readb(MCFGPIO_PAR_FEC0HL); |