diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/arm920t/imx/timer.c | 6 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/am33xx/sys_info.c | 4 | ||||
-rw-r--r-- | arch/arm/cpu/sa1100/timer.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-zynq/cpu.c | 8 |
4 files changed, 5 insertions, 18 deletions
diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c index b62558f92f..178422a9bf 100644 --- a/arch/arm/cpu/arm920t/imx/timer.c +++ b/arch/arm/cpu/arm920t/imx/timer.c @@ -78,11 +78,7 @@ unsigned long long get_ticks(void) */ ulong get_tbclk (void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - - return tbclk; + return CONFIG_SYS_HZ; } /* diff --git a/arch/arm/cpu/armv7/am33xx/sys_info.c b/arch/arm/cpu/armv7/am33xx/sys_info.c index 52a6824cf5..f42eee166b 100644 --- a/arch/arm/cpu/armv7/am33xx/sys_info.c +++ b/arch/arm/cpu/armv7/am33xx/sys_info.c @@ -65,9 +65,7 @@ u32 get_device_type(void) */ u32 get_sysboot_value(void) { - int mode; - mode = readl(&cstat->statusreg) & (SYSBOOT_MASK); - return mode; + return readl(&cstat->statusreg) & SYSBOOT_MASK; } #ifdef CONFIG_DISPLAY_CPUINFO diff --git a/arch/arm/cpu/sa1100/timer.c b/arch/arm/cpu/sa1100/timer.c index 0a0006b426..90e2128b22 100644 --- a/arch/arm/cpu/sa1100/timer.c +++ b/arch/arm/cpu/sa1100/timer.c @@ -66,8 +66,5 @@ unsigned long long get_ticks(void) */ ulong get_tbclk (void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return CONFIG_SYS_HZ; } diff --git a/arch/arm/mach-zynq/cpu.c b/arch/arm/mach-zynq/cpu.c index 914b1feb68..ba9171ebe9 100644 --- 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) |