Change return value on error.

[fw/openocd] / src / flash / nand / davinci.c

diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c
index af39dbf999c707c666f3eb58c34b0c369b223a42..e12fc46104692063c59aa70a1d150bb9f1a28a17 100644 (file)
--- a/src/flash/nand/davinci.c
+++ b/src/flash/nand/davinci.c
@@ -263,7 +263,7 @@ static int davinci_write_page(struct nand_device *nand, uint32_t page,
 
        /* Always write both data and OOB ... we are not "raw" I/O! */
        if (!data) {
-               LOG_ERROR("Missing NAND data; try 'nand raw_access enable'\n");
+               LOG_ERROR("Missing NAND data; try 'nand raw_access enable'");
                return ERROR_NAND_OPERATION_FAILED;
        }
 
@@ -689,10 +689,7 @@ NAND_DEVICE_COMMAND_HANDLER(davinci_nand_device_command)
         * Plus someday, optionally, ALE and CLE masks.
         */
        if (CMD_ARGC < 5) {
-               LOG_ERROR("parameters: %s target "
-                               "chip_addr hwecc_mode aemif_addr",
-                               CMD_ARGV[0]);
-               goto fail;
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        COMMAND_PARSE_NUMBER(ulong, CMD_ARGV[2], chip);
@@ -783,6 +780,7 @@ fail:
 
 struct nand_flash_controller davinci_nand_controller = {
        .name                   = "davinci",
+       .usage                  = "chip_addr hwecc_mode aemif_addr",
        .nand_device_command    = davinci_nand_device_command,
        .init                   = davinci_init,
        .reset                  = davinci_reset,