mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-29 07:33:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

cmd: mmc: Return CMD_RET_* from commands

Browse Source 
Numeric return values may cause strange errors line:
exit not allowed from main input shell.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Pali Rohár 2023-03-22 21:06:53 +01:00 committed by Jaehoon Chung
parent 8b88206696
commit fbf368f176
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/mmc.c
View File

@ -175,7 +175,7 @@ static int do_mmcinfo(struct cmd_tbl *cmdtp, int flag, int argc,
curr_device = 0; curr_device = 0;
else { else {
puts("No MMC device available\n"); puts("No MMC device available\n");
return 1; return CMD_RET_FAILURE;
} }
} }
@ -927,7 +927,7 @@ static int mmc_partconf_print(struct mmc *mmc, const char *varname)
static int do_mmc_partconf(struct cmd_tbl *cmdtp, int flag, static int do_mmc_partconf(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[]) int argc, char *const argv[])
{ {
int dev; int ret, dev;
struct mmc *mmc; struct mmc *mmc;
u8 ack, part_num, access; u8 ack, part_num, access;
@ -953,13 +953,17 @@ static int do_mmc_partconf(struct cmd_tbl *cmdtp, int flag,
access = dectoul(argv[4], NULL); access = dectoul(argv[4], NULL);
/* acknowledge to be sent during boot operation */ /* acknowledge to be sent during boot operation */
return mmc_set_part_conf(mmc, ack, part_num, access); ret = mmc_set_part_conf(mmc, ack, part_num, access);
if (ret != 0)
return CMD_RET_FAILURE;
return CMD_RET_SUCCESS;
} }
static int do_mmc_rst_func(struct cmd_tbl *cmdtp, int flag, static int do_mmc_rst_func(struct cmd_tbl *cmdtp, int flag,
int argc, char *const argv[]) int argc, char *const argv[])
{ {
int dev; int ret, dev;
struct mmc *mmc; struct mmc *mmc;
u8 enable; u8 enable;
@ -988,7 +992,11 @@ static int do_mmc_rst_func(struct cmd_tbl *cmdtp, int flag,
return CMD_RET_FAILURE; return CMD_RET_FAILURE;
} }
return mmc_set_rst_n_function(mmc, enable); ret = mmc_set_rst_n_function(mmc, enable);
if (ret != 0)
return CMD_RET_FAILURE;
return CMD_RET_SUCCESS;
} }
#endif #endif
static int do_mmc_setdsr(struct cmd_tbl *cmdtp, int flag, static int do_mmc_setdsr(struct cmd_tbl *cmdtp, int flag,