Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 63a7578e4e7dc906e75b0bec5a2f3fe41c3720f4

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 7dc0789579
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arch, board: squash lines for immediate return 

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Minkyu Kang <mk7.kang@samsung.com>
Reviewed-by: Angelo Dureghello <angelo@sysam.it>

Showing 16 changed files with 21 additions and 82 deletions Side-by-side Diff

arch/arm/cpu/arm920t/imx/timer.c
Diff comments   View file @ 63a7578
... ... @@ -78,11 +78,7 @@
78 78 */
79 79 ulong get_tbclk (void)
80 80 {
81   - ulong tbclk;
82   -
83   - tbclk = CONFIG_SYS_HZ;
84   -
85   - return tbclk;
  81 + return CONFIG_SYS_HZ;
86 82 }
87 83  
88 84 /*
arch/arm/cpu/armv7/am33xx/sys_info.c
Diff comments   View file @ 63a7578
... ... @@ -65,9 +65,7 @@
65 65 */
66 66 u32 get_sysboot_value(void)
67 67 {
68   - int mode;
69   - mode = readl(&cstat->statusreg) & (SYSBOOT_MASK);
70   - return mode;
  68 + return readl(&cstat->statusreg) & SYSBOOT_MASK;
71 69 }
72 70  
73 71 #ifdef CONFIG_DISPLAY_CPUINFO
arch/arm/cpu/sa1100/timer.c
Diff comments   View file @ 63a7578
... ... @@ -66,9 +66,6 @@
66 66 */
67 67 ulong get_tbclk (void)
68 68 {
69   - ulong tbclk;
70   -
71   - tbclk = CONFIG_SYS_HZ;
72   - return tbclk;
  69 + return CONFIG_SYS_HZ;
73 70 }
arch/arm/mach-zynq/cpu.c
Diff comments   View file @ 63a7578
... ... @@ -43,12 +43,8 @@
43 43  
44 44 unsigned int zynq_get_silicon_version(void)
45 45 {
46   - unsigned int ver;
47   -
48   - ver = (readl(&devcfg_base->mctrl) &
49   - ZYNQ_SILICON_VER_MASK) >> ZYNQ_SILICON_VER_SHIFT;
50   -
51   - return ver;
  46 + return (readl(&devcfg_base->mctrl) & ZYNQ_SILICON_VER_MASK)
  47 + >> ZYNQ_SILICON_VER_SHIFT;
52 48 }
53 49  
54 50 void reset_cpu(ulong addr)
arch/blackfin/cpu/interrupts.c
Diff comments   View file @ 63a7578
... ... @@ -47,10 +47,7 @@
47 47 */
48 48 ulong get_tbclk(void)
49 49 {
50   - ulong tbclk;
51   -
52   - tbclk = CONFIG_SYS_HZ;
53   - return tbclk;
  50 + return CONFIG_SYS_HZ;
54 51 }
55 52  
56 53 void enable_interrupts(void)
arch/m68k/lib/time.c
Diff comments   View file @ 63a7578
... ... @@ -192,8 +192,6 @@
192 192 */
193 193 ulong get_tbclk(void)
194 194 {
195   - ulong tbclk;
196   - tbclk = CONFIG_SYS_HZ;
197   - return tbclk;
  195 + return CONFIG_SYS_HZ;
198 196 }
arch/powerpc/cpu/mpc512x/cpu.c
Diff comments   View file @ 63a7578
... ... @@ -95,11 +95,7 @@
95 95 */
96 96 unsigned long get_tbclk (void)
97 97 {
98   - ulong tbclk;
99   -
100   - tbclk = (gd->bus_clk + 3L) / 4L;
101   -
102   - return tbclk;
  98 + return (gd->bus_clk + 3L) / 4L;
103 99 }
104 100  
105 101  
arch/powerpc/cpu/mpc83xx/cpu.c
Diff comments   View file @ 63a7578
... ... @@ -173,11 +173,7 @@
173 173  
174 174 unsigned long get_tbclk(void)
175 175 {
176   - ulong tbclk;
177   -
178   - tbclk = (gd->bus_clk + 3L) / 4L;
179   -
180   - return tbclk;
  176 + return (gd->bus_clk + 3L) / 4L;
181 177 }
182 178  
183 179  
arch/xtensa/lib/time.c
Diff comments   View file @ 63a7578
... ... @@ -104,10 +104,7 @@
104 104 */
105 105 ulong get_tbclk(void)
106 106 {
107   - ulong tbclk;
108   -
109   - tbclk = CONFIG_SYS_HZ;
110   - return tbclk;
  107 + return CONFIG_SYS_HZ;
111 108 }
112 109  
113 110 #if XCHAL_HAVE_CCOUNT
board/amcc/bamboo/bamboo.c
Diff comments   View file @ 63a7578
... ... @@ -438,11 +438,7 @@
438 438  
439 439 phys_size_t initdram (int board_type)
440 440 {
441   - long dram_size;
442   -
443   - dram_size = spd_sdram();
444   -
445   - return dram_size;
  441 + return spd_sdram();
446 442 }
447 443  
448 444 /*----------------------------------------------------------------------------+
board/amcc/bubinga/bubinga.c
Diff comments   View file @ 63a7578
... ... @@ -57,9 +57,6 @@
57 57 ------------------------------------------------------------------------- */
58 58 phys_size_t initdram(int board_type)
59 59 {
60   - long int ret;
61   -
62   - ret = spd_sdram();
63   - return ret;
  60 + return spd_sdram();
64 61 }
board/amcc/canyonlands/canyonlands.c
Diff comments   View file @ 63a7578
... ... @@ -63,11 +63,7 @@
63 63 */
64 64 static inline int board_fpga_read(int offset)
65 65 {
66   - int data;
67   -
68   - data = in_8((void *)(CONFIG_SYS_FPGA_BASE + offset));
69   -
70   - return data;
  66 + return in_8((void *)(CONFIG_SYS_FPGA_BASE + offset));
71 67 }
72 68  
73 69 static inline void board_fpga_write(int offset, int data)
board/corscience/tricorder/tricorder-eeprom.c
Diff comments   View file @ 63a7578
... ... @@ -190,13 +190,8 @@
190 190 if (argc == 3) {
191 191 ulong dev_addr = simple_strtoul(argv[2], NULL, 16);
192 192  
193   - if (strcmp(argv[1], "read") == 0) {
194   - int rcode;
195   -
196   - rcode = tricorder_eeprom_read(dev_addr);
197   -
198   - return rcode;
199   - }
  193 + if (strcmp(argv[1], "read") == 0)
  194 + return tricorder_eeprom_read(dev_addr);
200 195 } else if (argc == 6 || argc == 7) {
201 196 ulong dev_addr = simple_strtoul(argv[2], NULL, 16);
202 197 char *name = argv[3];
... ... @@ -207,14 +202,9 @@
207 202 if (argc == 7)
208 203 interface = argv[6];
209 204  
210   - if (strcmp(argv[1], "write") == 0) {
211   - int rcode;
212   -
213   - rcode = tricorder_eeprom_write(dev_addr, name, version,
214   - serial, interface);
215   -
216   - return rcode;
217   - }
  205 + if (strcmp(argv[1], "write") == 0)
  206 + return tricorder_eeprom_write(dev_addr, name, version,
  207 + serial, interface);
218 208 }
219 209  
220 210 return CMD_RET_USAGE;
board/freescale/common/zm7300.c
Diff comments   View file @ 63a7578
... ... @@ -140,9 +140,7 @@
140 140 /* Uses the DPM command RRP */
141 141 u8 zm_read(uchar reg)
142 142 {
143   - u8 d;
144   - d = dpm_rrp(reg);
145   - return d;
  143 + return dpm_rrp(reg);
146 144 }
147 145  
148 146 /* ZM_write --
board/samsung/goni/goni.c
Diff comments   View file @ 63a7578
... ... @@ -45,17 +45,11 @@
45 45  
46 46 int power_init_board(void)
47 47 {
48   - int ret;
49   -
50 48 /*
51 49 * For PMIC the I2C bus is named as I2C5, but it is connected
52 50 * to logical I2C adapter 0
53 51 */
54   - ret = pmic_init(I2C_0);
55   - if (ret)
56   - return ret;
57   -
58   - return 0;
  52 + return pmic_init(I2C_0);
59 53 }
60 54  
61 55 int dram_init(void)
board/ti/omap5_uevm/evm.c
Diff comments   View file @ 63a7578
... ... @@ -245,10 +245,7 @@
245 245  
246 246 int ehci_hcd_stop(void)
247 247 {
248   - int ret;
249   -
250   - ret = omap_ehci_hcd_stop();
251   - return ret;
  248 + return omap_ehci_hcd_stop();
252 249 }
253 250  
254 251 void usb_hub_reset_devices(int port)