diff options
Diffstat (limited to 'arch')
-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 | ||||
-rw-r--r-- | arch/blackfin/cpu/interrupts.c | 5 | ||||
-rw-r--r-- | arch/m68k/lib/time.c | 4 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc512x/cpu.c | 6 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc83xx/cpu.c | 6 | ||||
-rw-r--r-- | arch/xtensa/lib/time.c | 5 |
9 files changed, 10 insertions, 39 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) diff --git a/arch/blackfin/cpu/interrupts.c b/arch/blackfin/cpu/interrupts.c index 45c92c3d3e..abb7dc1d1d 100644 --- a/arch/blackfin/cpu/interrupts.c +++ b/arch/blackfin/cpu/interrupts.c @@ -47,10 +47,7 @@ unsigned long long get_ticks(void) */ ulong get_tbclk(void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return CONFIG_SYS_HZ; } void enable_interrupts(void) diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index 31633543e0..cb90c83f4e 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -192,7 +192,5 @@ unsigned long usec2ticks(unsigned long usec) */ ulong get_tbclk(void) { - ulong tbclk; - tbclk = CONFIG_SYS_HZ; - return tbclk; + return CONFIG_SYS_HZ; } diff --git a/arch/powerpc/cpu/mpc512x/cpu.c b/arch/powerpc/cpu/mpc512x/cpu.c index 8508e8db40..4ee91e16f9 100644 --- a/arch/powerpc/cpu/mpc512x/cpu.c +++ b/arch/powerpc/cpu/mpc512x/cpu.c @@ -95,11 +95,7 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) */ unsigned long get_tbclk (void) { - ulong tbclk; - - tbclk = (gd->bus_clk + 3L) / 4L; - - return tbclk; + return (gd->bus_clk + 3L) / 4L; } diff --git a/arch/powerpc/cpu/mpc83xx/cpu.c b/arch/powerpc/cpu/mpc83xx/cpu.c index 38093097e4..c87f0fdd29 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu.c +++ b/arch/powerpc/cpu/mpc83xx/cpu.c @@ -173,11 +173,7 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) unsigned long get_tbclk(void) { - ulong tbclk; - - tbclk = (gd->bus_clk + 3L) / 4L; - - return tbclk; + return (gd->bus_clk + 3L) / 4L; } diff --git a/arch/xtensa/lib/time.c b/arch/xtensa/lib/time.c index 1332072ffe..915eb5185b 100644 --- a/arch/xtensa/lib/time.c +++ b/arch/xtensa/lib/time.c @@ -104,10 +104,7 @@ unsigned long long get_ticks(void) */ ulong get_tbclk(void) { - ulong tbclk; - - tbclk = CONFIG_SYS_HZ; - return tbclk; + return CONFIG_SYS_HZ; } #if XCHAL_HAVE_CCOUNT |