projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[oweals/u-boot.git]
/
common
/
cmd_portio.c
diff --git
a/common/cmd_portio.c
b/common/cmd_portio.c
index 41b1991a275b4153cc56120324142c0c089186cc..eae8f079d6eb23ff70ad293fb3c30c75a7e812d8 100644
(file)
--- a/
common/cmd_portio.c
+++ b/
common/cmd_portio.c
@@
-37,19
+37,18
@@
static uint in_last_addr, in_last_size;
static uint out_last_addr, out_last_size, out_last_value;
static uint out_last_addr, out_last_size, out_last_value;
-int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *
const
argv[])
{
uint addr = out_last_addr;
uint size = out_last_size;
uint value = out_last_value;
{
uint addr = out_last_addr;
uint size = out_last_size;
uint value = out_last_value;
- if (argc != 3) {
- cmd_usage(cmdtp);
- return 1;
- }
+ if (argc != 3)
+ return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) {
if ((flag & CMD_FLAG_REPEAT) == 0) {
- /* New command specified. Check for a size specification.
+ /*
+ * New command specified. Check for a size specification.
* Defaults to long if no or incorrect specification.
*/
size = cmd_get_data_size (argv[0], 1);
* Defaults to long if no or incorrect specification.
*/
size = cmd_get_data_size (argv[0], 1);
@@
-94,21
+93,20
@@
int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD(
out, 3, 1, do_portio_out,
"write datum to IO port",
U_BOOT_CMD(
out, 3, 1, do_portio_out,
"write datum to IO port",
- "[.b, .w, .l] port value\n - output to IO port
\n
"
+ "[.b, .w, .l] port value\n - output to IO port"
);
);
-int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char *
const
argv[])
{
uint addr = in_last_addr;
uint size = in_last_size;
{
uint addr = in_last_addr;
uint size = in_last_size;
- if (argc != 2) {
- cmd_usage(cmdtp);
- return 1;
- }
+ if (argc != 2)
+ return CMD_RET_USAGE;
if ((flag & CMD_FLAG_REPEAT) == 0) {
if ((flag & CMD_FLAG_REPEAT) == 0) {
- /* New command specified. Check for a size specification.
+ /*
+ * New command specified. Check for a size specification.
* Defaults to long if no or incorrect specification.
*/
size = cmd_get_data_size (argv[0], 1);
* Defaults to long if no or incorrect specification.
*/
size = cmd_get_data_size (argv[0], 1);
@@
-159,5
+157,5
@@
U_BOOT_CMD(
in, 2, 1, do_portio_in,
"read data from an IO port",
"[.b, .w, .l] port\n"
in, 2, 1, do_portio_in,
"read data from an IO port",
"[.b, .w, .l] port\n"
- " - read datum from IO port
\n
"
+ " - read datum from IO port"
);
);