Skip to content

Commit 0b1284e

Browse files
sjg20trini
sjg20
authored and
trini
committed
global: Convert simple_strtoul() with decimal to dectoul()
It is a pain to have to specify the value 10 in each call. Add a new dectoul() function and update the code to use it. Signed-off-by: Simon Glass <[email protected]>
1 parent 7e5f460 commit 0b1284e

File tree

111 files changed

+255
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+255
-230
lines changed

‎arch/arm/cpu/armv8/fsl-layerscape/soc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ static unsigned long get_internval_val_mhz(void)
277277
ulong interval_mhz = get_bus_freq(0) / (1000 * 1000);
278278

279279
if (interval)
280-
interval_mhz = simple_strtoul(interval, NULL, 10);
280+
interval_mhz = dectoul(interval, NULL);
281281

282282
return interval_mhz;
283283
}

‎arch/arm/mach-imx/cmd_dek.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ static int do_dek_blob(struct cmd_tbl *cmdtp, int flag, int argc,
302302

303303
src_addr = hextoul(argv[1], NULL);
304304
dst_addr = hextoul(argv[2], NULL);
305-
len = simple_strtoul(argv[3], NULL, 10);
305+
len = dectoul(argv[3], NULL);
306306

307307
return blob_encap_dek(src_addr, dst_addr, len);
308308
}

‎arch/arm/mach-imx/cmd_mfgprot.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ static int do_mfgprot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
7272
return CMD_RET_USAGE;
7373

7474
m_addr = hextoul(argv[2], NULL);
75-
m_size = simple_strtoul(argv[3], NULL, 10);
75+
m_size = dectoul(argv[3], NULL);
7676
m_ptr = map_physmem(m_addr, m_size, MAP_NOCACHE);
7777
if (!m_ptr)
7878
return -ENOMEM;

‎arch/arm/mach-imx/imx8/snvs_security_sc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ static int do_tamper_pin_cfg(struct cmd_tbl *cmdtp, int flag, int argc,
726726
if (argc != (2 + 1))
727727
return CMD_RET_USAGE;
728728

729-
conf.pad = simple_strtoul(argv[++idx], NULL, 10);
729+
conf.pad = dectoul(argv[++idx], NULL);
730730
conf.mux_conf = hextoul(argv[++idx], NULL);
731731

732732
err = apply_tamper_pin_list_config(&conf, 1);

‎arch/arm/mach-keystone/cmd_clock.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ int do_pll_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
4242
else
4343
goto pll_cmd_usage;
4444

45-
cmd_pll_data.pll_m = simple_strtoul(argv[2], NULL, 10);
46-
cmd_pll_data.pll_d = simple_strtoul(argv[3], NULL, 10);
47-
cmd_pll_data.pll_od = simple_strtoul(argv[4], NULL, 10);
45+
cmd_pll_data.pll_m = dectoul(argv[2], NULL);
46+
cmd_pll_data.pll_d = dectoul(argv[3], NULL);
47+
cmd_pll_data.pll_od = dectoul(argv[4], NULL);
4848

4949
printf("Trying to set pll %d; mult %d; div %d; OD %d\n",
5050
cmd_pll_data.pll, cmd_pll_data.pll_m,
@@ -72,7 +72,7 @@ int do_getclk_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
7272
if (argc != 2)
7373
goto getclk_cmd_usage;
7474

75-
clk = simple_strtoul(argv[1], NULL, 10);
75+
clk = dectoul(argv[1], NULL);
7676

7777
freq = ks_clk_get_rate(clk);
7878
if (freq)
@@ -101,7 +101,7 @@ int do_psc_cmd(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
101101
if (argc != 3)
102102
goto psc_cmd_usage;
103103

104-
psc_module = simple_strtoul(argv[1], NULL, 10);
104+
psc_module = dectoul(argv[1], NULL);
105105
if (strcmp(argv[2], "en") == 0) {
106106
res = psc_enable_module(psc_module);
107107
printf("psc_enable_module(%d) - %s\n", psc_module,

‎arch/arm/mach-kirkwood/cpu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static void kw_sysrst_check(void)
125125
return;
126126

127127
/* read sysrstdelay value */
128-
sysrst_dly = (u32) simple_strtoul(s, NULL, 10);
128+
sysrst_dly = (u32)dectoul(s, NULL);
129129

130130
/* read SysRst Length counter register (bits 28:0) */
131131
sysrst_cnt = (0x1fffffff & readl(KW_REG_SYSRST_CNT));

‎arch/arm/mach-nexell/clock.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ struct clk *clk_get(const char *id)
592592
c = strrchr((const char *)str, (int)'.');
593593
if (!c || !cdev->peri)
594594
break;
595-
devid = simple_strtoul(++c, NULL, 10);
595+
devid = dectoul(++c, NULL);
596596
if (cdev->peri->dev_id == devid)
597597
break;
598598
}

‎arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc,
5959
return CMD_RET_USAGE;
6060
}
6161

62-
dev = (int)simple_strtoul(argv[2], NULL, 10);
62+
dev = (int)dectoul(argv[2], NULL);
6363

6464
addr = STM32_DDR_BASE;
6565
size = 0;

‎arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static int parse_type(struct stm32prog_data *data,
253253
result = -EINVAL;
254254
else
255255
part->bin_nb =
256-
simple_strtoul(&p[7], NULL, 10);
256+
dectoul(&p[7], NULL);
257257
}
258258
} else if (!strcmp(p, "System")) {
259259
part->part_type = PART_SYSTEM;

‎arch/powerpc/cpu/mpc83xx/ecc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ int do_ecc(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
138138
}
139139
if (argc == 3) {
140140
if (strcmp(argv[1], "sbecnt") == 0) {
141-
val = simple_strtoul(argv[2], NULL, 10);
141+
val = dectoul(argv[2], NULL);
142142
if (val > 255) {
143143
printf("Incorrect Counter value, "
144144
"should be 0..255\n");
@@ -151,7 +151,7 @@ int do_ecc(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
151151
ddr->err_sbe = val;
152152
return 0;
153153
} else if (strcmp(argv[1], "sbethr") == 0) {
154-
val = simple_strtoul(argv[2], NULL, 10);
154+
val = dectoul(argv[2], NULL);
155155
if (val > 255) {
156156
printf("Incorrect Counter value, "
157157
"should be 0..255\n");

‎board/Arcturus/ucp1020/ucp1020.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void spi_set_speed(struct spi_slave *slave, uint hz)
5252
*/
5353
int name_to_gpio(const char *name)
5454
{
55-
int gpio = 31 - simple_strtoul(name, NULL, 10);
55+
int gpio = 31 - dectoul(name, NULL);
5656

5757
if (gpio < 16)
5858
gpio = -1;

‎board/BuS/eb_cpu5282/eb_cpu5282.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ int drv_video_init(void)
194194
printf("Init Video as ");
195195
s = env_get("displaywidth");
196196
if (s != NULL)
197-
display_width = simple_strtoul(s, NULL, 10);
197+
display_width = dectoul(s, NULL);
198198
else
199199
display_width = 256;
200200

201201
s = env_get("displayheight");
202202
if (s != NULL)
203-
display_height = simple_strtoul(s, NULL, 10);
203+
display_height = dectoul(s, NULL);
204204
else
205205
display_height = 256;
206206

@@ -234,8 +234,8 @@ int do_brightness(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
234234

235235
switch (argc) {
236236
case 3:
237-
side = simple_strtoul(argv[1], NULL, 10);
238-
bright = simple_strtoul(argv[2], NULL, 10);
237+
side = dectoul(argv[1], NULL);
238+
bright = dectoul(argv[2], NULL);
239239
if ((side >= 0) && (side <= 3) &&
240240
(bright >= 0) && (bright <= 1000)) {
241241
vcxk_setbrightness(side, bright);

‎board/atmel/common/board.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void at91_pda_detect(void)
4747
break;
4848
}
4949
}
50-
pda = simple_strtoul((const char *)buf, NULL, 10);
50+
pda = dectoul((const char *)buf, NULL);
5151

5252
switch (pda) {
5353
case 7000:

‎board/cavium/thunderx/atf.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -236,47 +236,47 @@ int do_atf(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
236236

237237
if ((argc == 5) && !strcmp(argv[1], "readmmc")) {
238238
buffer = (void *)hextoul(argv[2], NULL);
239-
offset = simple_strtoul(argv[3], NULL, 10);
240-
size = simple_strtoul(argv[4], NULL, 10);
239+
offset = dectoul(argv[3], NULL);
240+
size = dectoul(argv[4], NULL);
241241

242242
ret = atf_read_mmc(offset, buffer, size);
243243
} else if ((argc == 5) && !strcmp(argv[1], "readnor")) {
244244
buffer = (void *)hextoul(argv[2], NULL);
245-
offset = simple_strtoul(argv[3], NULL, 10);
246-
size = simple_strtoul(argv[4], NULL, 10);
245+
offset = dectoul(argv[3], NULL);
246+
size = dectoul(argv[4], NULL);
247247

248248
ret = atf_read_nor(offset, buffer, size);
249249
} else if ((argc == 5) && !strcmp(argv[1], "writemmc")) {
250250
buffer = (void *)hextoul(argv[2], NULL);
251-
offset = simple_strtoul(argv[3], NULL, 10);
252-
size = simple_strtoul(argv[4], NULL, 10);
251+
offset = dectoul(argv[3], NULL);
252+
size = dectoul(argv[4], NULL);
253253

254254
ret = atf_write_mmc(offset, buffer, size);
255255
} else if ((argc == 5) && !strcmp(argv[1], "writenor")) {
256256
buffer = (void *)hextoul(argv[2], NULL);
257-
offset = simple_strtoul(argv[3], NULL, 10);
258-
size = simple_strtoul(argv[4], NULL, 10);
257+
offset = dectoul(argv[3], NULL);
258+
size = dectoul(argv[4], NULL);
259259

260260
ret = atf_write_nor(offset, buffer, size);
261261
} else if ((argc == 2) && !strcmp(argv[1], "part")) {
262262
atf_print_part_table();
263263
} else if ((argc == 4) && !strcmp(argv[1], "erasenor")) {
264-
offset = simple_strtoul(argv[2], NULL, 10);
265-
size = simple_strtoul(argv[3], NULL, 10);
264+
offset = dectoul(argv[2], NULL);
265+
size = dectoul(argv[3], NULL);
266266

267267
ret = atf_erase_nor(offset, size);
268268
} else if ((argc == 2) && !strcmp(argv[1], "envcount")) {
269269
ret = atf_env_count();
270270
printf("Number of environment strings: %zd\n", ret);
271271
} else if ((argc == 3) && !strcmp(argv[1], "envstring")) {
272-
index = simple_strtoul(argv[2], NULL, 10);
272+
index = dectoul(argv[2], NULL);
273273
ret = atf_env_string(index, str);
274274
if (ret > 0)
275275
printf("Environment string %d: %s\n", index, str);
276276
else
277277
printf("Return code: %zd\n", ret);
278278
} else if ((argc == 3) && !strcmp(argv[1], "dramsize")) {
279-
node = simple_strtoul(argv[2], NULL, 10);
279+
node = dectoul(argv[2], NULL);
280280
ret = atf_dram_size(node);
281281
printf("DRAM size: %zd Mbytes\n", ret >> 20);
282282
} else if ((argc == 2) && !strcmp(argv[1], "nodes")) {

‎board/compulab/common/eeprom.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ u32 cl_eeprom_get_board_rev(uint eeprom_bus)
153153
*/
154154
if (cl_eeprom_layout == LAYOUT_LEGACY) {
155155
sprintf(str, "%x", board_rev);
156-
board_rev = simple_strtoul(str, NULL, 10);
156+
board_rev = dectoul(str, NULL);
157157
}
158158

159159
return board_rev;

‎board/compulab/common/omap3_display.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ static int parse_pixclock(char *pixclock)
244244
int divisor, pixclock_val;
245245
char *pixclk_start = pixclock;
246246

247-
pixclock_val = simple_strtoul(pixclock, &pixclock, 10);
247+
pixclock_val = dectoul(pixclock, &pixclock);
248248
divisor = DIV_ROUND_UP(PIXEL_CLK_NUMERATOR, pixclock_val);
249249
/* 0 and 1 are illegal values for PCD */
250250
if (divisor <= 1)

‎board/davinci/da8xxevm/da850evm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ u32 get_board_rev(void)
284284

285285
s = env_get("maxcpuclk");
286286
if (s)
287-
maxcpuclk = simple_strtoul(s, NULL, 10);
287+
maxcpuclk = dectoul(s, NULL);
288288

289289
if (maxcpuclk >= 456000000)
290290
rev = 3;

‎board/freescale/common/pixis.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@ static unsigned long strfractoint(char *strptr)
403403
mulconst = 1;
404404
for (i = 0; i < j; i++)
405405
mulconst *= 10;
406-
decval = simple_strtoul(decarr, NULL, 10);
406+
decval = dectoul(decarr, NULL);
407407
}
408408

409-
intval = simple_strtoul(intarr, NULL, 10);
409+
intval = dectoul(intarr, NULL);
410410
intval = intval * mulconst;
411411

412412
return intval + decval;
@@ -489,9 +489,9 @@ static int pixis_reset_cmd(struct cmd_tbl *cmdtp, int flag, int argc,
489489
unsigned long corepll;
490490
unsigned long mpxpll;
491491

492-
sysclk = simple_strtoul(p_cf_sysclk, NULL, 10);
492+
sysclk = dectoul(p_cf_sysclk, NULL);
493493
corepll = strfractoint(p_cf_corepll);
494-
mpxpll = simple_strtoul(p_cf_mpxpll, NULL, 10);
494+
mpxpll = dectoul(p_cf_mpxpll, NULL);
495495

496496
if (!(set_px_sysclk(sysclk)
497497
&& set_px_corepll(corepll)

‎board/freescale/common/sys_eeprom.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ int do_mac(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
456456
update_crc();
457457
break;
458458
case '0' ... '9': /* "mac 0" through "mac 22" */
459-
set_mac_address(simple_strtoul(argv[1], NULL, 10), argv[2]);
459+
set_mac_address(dectoul(argv[1], NULL), argv[2]);
460460
break;
461461
case 'h': /* help */
462462
default:

‎board/gateworks/gw_ventana/gsc.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ static int do_gsc_sleep(struct cmd_tbl *cmdtp, int flag, int argc,
277277
if (argc < 2)
278278
return CMD_RET_USAGE;
279279

280-
secs = simple_strtoul(argv[1], NULL, 10);
280+
secs = dectoul(argv[1], NULL);
281281
printf("GSC Sleeping for %ld seconds\n", secs);
282282

283283
i2c_set_bus_num(0);
@@ -322,7 +322,7 @@ static int do_gsc_wd(struct cmd_tbl *cmdtp, int flag, int argc,
322322
int timeout = 0;
323323

324324
if (argc > 2)
325-
timeout = simple_strtoul(argv[2], NULL, 10);
325+
timeout = dectoul(argv[2], NULL);
326326
i2c_set_bus_num(0);
327327
if (gsc_i2c_read(GSC_SC_ADDR, GSC_SC_CTRL1, 1, &reg, 1))
328328
return CMD_RET_FAILURE;

‎board/gateworks/gw_ventana/gw_ventana.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ void get_board_serial(struct tag_serialnr *serialnr)
471471

472472
if (serial) {
473473
serialnr->high = 0;
474-
serialnr->low = simple_strtoul(serial, NULL, 10);
474+
serialnr->low = dectoul(serial, NULL);
475475
} else if (ventana_info.model[0]) {
476476
serialnr->high = 0;
477477
serialnr->low = ventana_info.serial;

‎board/gateworks/venice/gsc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ static int do_gsc(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]
660660
if (strcasecmp(argv[1], "sleep") == 0) {
661661
if (argc < 3)
662662
return CMD_RET_USAGE;
663-
if (!gsc_sleep(simple_strtoul(argv[2], NULL, 10)))
663+
if (!gsc_sleep(dectoul(argv[2], NULL)))
664664
return CMD_RET_SUCCESS;
665665
} else if (strcasecmp(argv[1], "hwmon") == 0) {
666666
if (!gsc_hwmon())

‎board/gdsys/common/cmd_ioloop.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -275,13 +275,13 @@ int do_ioreflect(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
275275
if (argc < 2)
276276
return CMD_RET_USAGE;
277277

278-
fpga = simple_strtoul(argv[1], NULL, 10);
278+
fpga = dectoul(argv[1], NULL);
279279

280280
/*
281281
* If another parameter, it is the report rate in packets.
282282
*/
283283
if (argc > 2)
284-
rate = simple_strtoul(argv[2], NULL, 10);
284+
rate = dectoul(argv[2], NULL);
285285

286286
/* Enable receive path */
287287
FPGA_SET_REG(fpga, ep.rx_tx_control, CTRL_PROC_RECEIVE_ENABLE);
@@ -388,18 +388,18 @@ int do_ioloop(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
388388
/*
389389
* FPGA is specified since argc > 2
390390
*/
391-
fpga = simple_strtoul(argv[1], NULL, 10);
391+
fpga = dectoul(argv[1], NULL);
392392

393393
/*
394394
* packet size is specified since argc > 2
395395
*/
396-
size = simple_strtoul(argv[2], NULL, 10);
396+
size = dectoul(argv[2], NULL);
397397

398398
/*
399399
* If another parameter, it is the test rate in packets per second.
400400
*/
401401
if (argc > 3)
402-
rate = simple_strtoul(argv[3], NULL, 10);
402+
rate = dectoul(argv[3], NULL);
403403

404404
/* enable receive path */
405405
FPGA_SET_REG(fpga, ep.rx_tx_control, CTRL_PROC_RECEIVE_ENABLE);
@@ -463,13 +463,13 @@ int do_ioloop(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
463463
/*
464464
* packet size is specified since argc > 1
465465
*/
466-
size = simple_strtoul(argv[2], NULL, 10);
466+
size = dectoul(argv[2], NULL);
467467

468468
/*
469469
* If another parameter, it is the test rate in packets per second.
470470
*/
471471
if (argc > 2)
472-
rate = simple_strtoul(argv[3], NULL, 10);
472+
rate = dectoul(argv[3], NULL);
473473

474474
/* Enable receive path */
475475
misc_set_enabled(dev, true);
@@ -514,7 +514,7 @@ int do_iodev(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
514514
return CMD_RET_FAILURE;
515515

516516
if (argc > 1) {
517-
int i = simple_strtoul(argv[1], NULL, 10);
517+
int i = dectoul(argv[1], NULL);
518518

519519
snprintf(name, sizeof(name), "ioep%d", i);
520520

‎board/samsung/common/exynos5-dt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
169169
if (board_is_odroidxu4() || board_is_odroidhc1() || board_is_odroidhc2())
170170
return info;
171171

172-
dev_num = simple_strtoul(devstr, NULL, 10);
172+
dev_num = dectoul(devstr, NULL);
173173

174174
mmc = find_mmc_device(dev_num);
175175
if (!mmc)

0 commit comments

Comments
 (0)