Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[oweals/u-boot.git] / arch / arm / mach-zynq / cpu.c

diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c
index 914b1feb6833310144d229c307b8130218d00f02..ba9171ebe9f94c1ba455178ccc7030e70d027358 100644 (file)
--- a/arch/arm/mach-zynq/cpu.c
+++ b/arch/arm/mach-zynq/cpu.c
@@ -43,12 +43,8 @@ int arch_cpu_init(void)
 
 unsigned int zynq_get_silicon_version(void)
 {
-       unsigned int ver;
-
-       ver = (readl(&devcfg_base->mctrl) &
-              ZYNQ_SILICON_VER_MASK) >> ZYNQ_SILICON_VER_SHIFT;
-
-       return ver;
+       return (readl(&devcfg_base->mctrl) & ZYNQ_SILICON_VER_MASK)
+                                               >> ZYNQ_SILICON_VER_SHIFT;
 }
 
 void reset_cpu(ulong addr)