[v3,7/8] arch, board: squash lines for immediate return

Message ID	1473167860-27465-8-git-send-email-yamada.masahiro@socionext.com
State	New
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; From: Masahiro Yamada <yamada.masahiro@socionext.com> To: u-boot@lists.denx.de Date: Tue, 6 Sep 2016 22:17:38 +0900 Message-Id: <1473167860-27465-8-git-send-email-yamada.masahiro@socionext.com> In-Reply-To: <1473167860-27465-1-git-send-email-yamada.masahiro@socionext.com> References: <1473167860-27465-1-git-send-email-yamada.masahiro@socionext.com> Cc: Marek Vasut <marex@denx.de>, Chris Zankel <chris@zankel.net>, Stephen Warren <swarren@nvidia.com>, Huan Wang <alison.wang@freescale.com>, Thomas Weber <weber@corscience.de>, Robert Baldyga <r.baldyga@samsung.com>, Angelo Dureghello <angelo@sysam.it>, Stefan Roese <sr@denx.de> Subject: [U-Boot] [PATCH v3 7/8] arch, board: squash lines for immediate return Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de>

diff --git a/arch/arm/cpu/arm920t/imx/timer.c b/arch/arm/cpu/arm920t/imx/timer.c index b62558f..178422a 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 52a6824..f42eee1 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 0a0006b..90e2128 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 914b1fe..ba9171e 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 45c92c3..abb7dc1 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 3163354..cb90c83 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 8508e8d..4ee91e1 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 3809309..c87f0fd 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 1332072..915eb51 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 diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c index c8d0963..2838f9a 100644 --- a/board/amcc/bamboo/bamboo.c +++ b/board/amcc/bamboo/bamboo.c @@ -438,11 +438,7 @@ int checkboard(void) phys_size_t initdram (int board_type) { - long dram_size; - - dram_size = spd_sdram(); - - return dram_size; + return spd_sdram(); } /*----------------------------------------------------------------------------+ diff --git a/board/amcc/bubinga/bubinga.c b/board/amcc/bubinga/bubinga.c index 5c1e071..9043de6 100644 --- a/board/amcc/bubinga/bubinga.c +++ b/board/amcc/bubinga/bubinga.c @@ -57,8 +57,5 @@ int checkboard(void) ------------------------------------------------------------------------- */ phys_size_t initdram(int board_type) { - long int ret; - - ret = spd_sdram(); - return ret; + return spd_sdram(); } diff --git a/board/amcc/canyonlands/canyonlands.c b/board/amcc/canyonlands/canyonlands.c index dc2e3ba..80b7739 100644 --- a/board/amcc/canyonlands/canyonlands.c +++ b/board/amcc/canyonlands/canyonlands.c @@ -63,11 +63,7 @@ u32 ddr_clktr(u32 default_val) { */ static inline int board_fpga_read(int offset) { - int data; - - data = in_8((void *)(CONFIG_SYS_FPGA_BASE + offset)); - - return data; + return in_8((void *)(CONFIG_SYS_FPGA_BASE + offset)); } static inline void board_fpga_write(int offset, int data) diff --git a/board/corscience/tricorder/tricorder-eeprom.c b/board/corscience/tricorder/tricorder-eeprom.c index 340a009..aeacd6a 100644 --- a/board/corscience/tricorder/tricorder-eeprom.c +++ b/board/corscience/tricorder/tricorder-eeprom.c @@ -190,13 +190,8 @@ int do_tricorder_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argc == 3) { ulong dev_addr = simple_strtoul(argv[2], NULL, 16); - if (strcmp(argv[1], "read") == 0) { - int rcode; - - rcode = tricorder_eeprom_read(dev_addr); - - return rcode; - } + if (strcmp(argv[1], "read") == 0) + return tricorder_eeprom_read(dev_addr); } else if (argc == 6 || argc == 7) { ulong dev_addr = simple_strtoul(argv[2], NULL, 16); char *name = argv[3]; @@ -207,14 +202,9 @@ int do_tricorder_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) if (argc == 7) interface = argv[6]; - if (strcmp(argv[1], "write") == 0) { - int rcode; - - rcode = tricorder_eeprom_write(dev_addr, name, version, - serial, interface); - - return rcode; - } + if (strcmp(argv[1], "write") == 0) + return tricorder_eeprom_write(dev_addr, name, version, + serial, interface); } return CMD_RET_USAGE; diff --git a/board/freescale/common/zm7300.c b/board/freescale/common/zm7300.c index be5953a..a6c3e69 100644 --- a/board/freescale/common/zm7300.c +++ b/board/freescale/common/zm7300.c @@ -140,9 +140,7 @@ int dpm_wrp(u8 r, u8 d) /* Uses the DPM command RRP */ u8 zm_read(uchar reg) { - u8 d; - d = dpm_rrp(reg); - return d; + return dpm_rrp(reg); } /* ZM_write -- diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index 1600568..e8329bb 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -45,17 +45,11 @@ void i2c_init_board(void) int power_init_board(void) { - int ret; - /* * For PMIC the I2C bus is named as I2C5, but it is connected * to logical I2C adapter 0 */ - ret = pmic_init(I2C_0); - if (ret) - return ret; - - return 0; + return pmic_init(I2C_0); } int dram_init(void) diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c index 50da410..b5d5ba9 100644 --- a/board/ti/omap5_uevm/evm.c +++ b/board/ti/omap5_uevm/evm.c @@ -245,10 +245,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, int ehci_hcd_stop(void) { - int ret; - - ret = omap_ehci_hcd_stop(); - return ret; + return omap_ehci_hcd_stop(); } void usb_hub_reset_devices(int port)

[v3,7/8] arch, board: squash lines for immediate return

Commit Message

Patch