cmd: gpio: Correct do_gpio() return value

Use the correct return value in function do_gpio() and update
commands documentation with the return values from command_ret_t enum.

CMD_RET_SUCCESS is returned on command success and CMD_RET_FAILURE is
returned on command failure.

The command was returning the pin value, which caused confusion when
debugging (#define DEBUG).

Signed-off-by: Luka Kovacic <luka.kovacic@sartura.hr>
Tested-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/cmd/gpio.c b/cmd/gpio.c
index eff36ab2af329df34e83bafee24a633a8380ae76..67eef83c951c73326e3a458c4417b51a70a1c172 100644 (file)
--- a/cmd/gpio.c
+++ b/cmd/gpio.c
@@ -223,23 +223,35 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                gpio_direction_output(gpio, value);
        }
        printf("gpio: pin %s (gpio %u) value is ", str_gpio, gpio);
-       if (IS_ERR_VALUE(value))
+
+       if (IS_ERR_VALUE(value)) {
                printf("unknown (ret=%d)\n", value);
-       else
+               goto err;
+       } else {
                printf("%d\n", value);
+       }
+
        if (sub_cmd != GPIOC_INPUT && !IS_ERR_VALUE(value)) {
                int nval = gpio_get_value(gpio);
 
-               if (IS_ERR_VALUE(nval))
+               if (IS_ERR_VALUE(nval)) {
                        printf("   Warning: no access to GPIO output value\n");
-               else if (nval != value)
+                       goto err;
+               } else if (nval != value) {
                        printf("   Warning: value of pin is still %d\n", nval);
+                       goto err;
+               }
        }
 
        if (ret != -EBUSY)
                gpio_free(gpio);
 
-       return value;
+       return CMD_RET_SUCCESS;
+
+err:
+       if (ret != -EBUSY)
+               gpio_free(gpio);
+       return CMD_RET_FAILURE;
 }
 
 U_BOOT_CMD(gpio, 4, 0, do_gpio,

diff --git a/doc/README.commands b/doc/README.commands
index e03eb44187edd43ce495d374c8904b03036b0b57..4e9e8098fa81a8090fac38c0391815c5b6bfaa1f 100644 (file)
--- a/doc/README.commands
+++ b/doc/README.commands
@@ -83,9 +83,9 @@ argv:         Arguments.
 
 Allowable return value are:
 
-CMD_SUCCESS    The command was successfully executed.
+CMD_RET_SUCCESS        The command was successfully executed.
 
-CMD_FAILURE    The command failed.
+CMD_RET_FAILURE        The command failed.
 
 CMD_RET_USAGE  The command was called with invalid parameters. This value
                leads to the display of the usage string.