leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pci: Use a common return in command processing

Browse Source 
Adjust the commands to return from the same place.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2015-11-26 19:51:18 -07:00
parent e81ca88451
commit bfa4191e03
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/cmd_pci.c
View File

@ -410,6 +410,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
ulong addr = 0, value = 0, size = 0; ulong addr = 0, value = 0, size = 0;
pci_dev_t bdf = 0; pci_dev_t bdf = 0;
char cmd = 's'; char cmd = 's';
int ret = 0;
if (argc > 1) if (argc > 1)
cmd = argv[1][0]; cmd = argv[1][0];
@ -453,7 +454,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
switch (argv[1][0]) { switch (argv[1][0]) {
case 'h': /* header */ case 'h': /* header */
pci_header_show(bdf); pci_header_show(bdf);
return 0; break;
case 'd': /* display */ case 'd': /* display */
return pci_cfg_display(bdf, addr, size, value); return pci_cfg_display(bdf, addr, size, value);
#ifdef CONFIG_CMD_PCI_ENUM #ifdef CONFIG_CMD_PCI_ENUM
@ -463,23 +464,29 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
# else # else
pci_init(); pci_init();
# endif # endif
return 0; break;
#endif #endif
case 'n': /* next */ case 'n': /* next */
if (argc < 4) if (argc < 4)
goto usage; goto usage;
return pci_cfg_modify(bdf, addr, size, value, 0); ret = pci_cfg_modify(bdf, addr, size, value, 0);
break;
case 'm': /* modify */ case 'm': /* modify */
if (argc < 4) if (argc < 4)
goto usage; goto usage;
return pci_cfg_modify(bdf, addr, size, value, 1); ret = pci_cfg_modify(bdf, addr, size, value, 1);
break;
case 'w': /* write */ case 'w': /* write */
if (argc < 5) if (argc < 5)
goto usage; goto usage;
return pci_cfg_write(bdf, addr, size, value); ret = pci_cfg_write(bdf, addr, size, value);
break;
default:
ret = CMD_RET_USAGE;
break;
} }
return 1; return ret;
usage: usage:
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }