openocd: remove NULL comparisons with checkpatch [2/2]

[openocd.git] / src / flash / nand / fileio.c

diff --git a/src/flash/nand/fileio.c b/src/flash/nand/fileio.c
index 76f6e104a441ccd99887da8f9f5fba2186f68b02..49db112e2d62711a1818b452fe4b6ecab4951780 100644 (file)
--- a/src/flash/nand/fileio.c
+++ b/src/flash/nand/fileio.c
@@ -59,17 +59,17 @@ int nand_fileio_start(struct command_invocation *cmd,
        struct nand_fileio_state *state)
 {
        if (state->address % nand->page_size) {
-               command_print(cmd->ctx, "only page-aligned addresses are supported");
+               command_print(cmd, "only page-aligned addresses are supported");
                return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
        duration_start(&state->bench);
 
-       if (NULL != filename) {
+       if (filename) {
                int retval = fileio_open(&state->fileio, filename, filemode, FILEIO_BINARY);
-               if (ERROR_OK != retval) {
-                       const char *msg = (FILEIO_READ == filemode) ? "read" : "write";
-                       command_print(cmd->ctx, "failed to open '%s' for %s access",
+               if (retval != ERROR_OK) {
+                       const char *msg = (filemode == FILEIO_READ) ? "read" : "write";
+                       command_print(cmd, "failed to open '%s' for %s access",
                                filename, msg);
                        return retval;
                }
@@ -99,14 +99,11 @@ int nand_fileio_cleanup(struct nand_fileio_state *state)
        if (state->file_opened)
                fileio_close(state->fileio);
 
-       if (state->oob) {
-               free(state->oob);
-               state->oob = NULL;
-       }
-       if (state->page) {
-               free(state->page);
-               state->page = NULL;
-       }
+       free(state->oob);
+       state->oob = NULL;
+
+       free(state->page);
+       state->page = NULL;
        return ERROR_OK;
 }
 int nand_fileio_finish(struct nand_fileio_state *state)
@@ -127,11 +124,11 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
 
        struct nand_device *nand;
        int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &nand);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
-       if (NULL == nand->device) {
-               command_print(CMD_CTX, "#%s: not probed", CMD_ARGV[0]);
+       if (!nand->device) {
+               command_print(CMD, "#%s: not probed", CMD_ARGV[0]);
                return ERROR_NAND_DEVICE_NOT_PROBED;
        }
 
@@ -139,7 +136,7 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
        if (need_size) {
                COMMAND_PARSE_NUMBER(u32, CMD_ARGV[3], state->size);
                if (state->size % nand->page_size) {
-                       command_print(CMD_CTX, "only page-aligned sizes are supported");
+                       command_print(CMD, "only page-aligned sizes are supported");
                        return ERROR_COMMAND_SYNTAX_ERROR;
                }
        }
@@ -155,14 +152,14 @@ COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
                        else if (sw_ecc && !strcmp(CMD_ARGV[i], "oob_softecc_kw"))
                                state->oob_format |= NAND_OOB_SW_ECC_KW;
                        else {
-                               command_print(CMD_CTX, "unknown option: %s", CMD_ARGV[i]);
+                               command_print(CMD, "unknown option: %s", CMD_ARGV[i]);
                                return ERROR_COMMAND_SYNTAX_ERROR;
                        }
                }
        }
 
        retval = nand_fileio_start(CMD, nand, CMD_ARGV[1], filemode, state);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        if (!need_size) {
@@ -187,7 +184,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
        size_t total_read = 0;
        size_t one_read;
 
-       if (NULL != s->page) {
+       if (s->page) {
                fileio_read(s->fileio, s->page_size, s->page, &one_read);
                if (one_read < s->page_size)
                        memset(s->page + one_read, 0xff, s->page_size - one_read);
@@ -206,7 +203,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
        } else if (s->oob_format & NAND_OOB_SW_ECC_KW)   {
                /*
                 * In this case eccpos is not used as
-                * the ECC data is always stored contigously
+                * the ECC data is always stored contiguously
                 * at the end of the OOB area.  It consists
                 * of 10 bytes per 512-byte data block.
                 */
@@ -216,7 +213,7 @@ int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s)
                        nand_calculate_ecc_kw(nand, s->page + i, ecc);
                        ecc += 10;
                }
-       } else if (NULL != s->oob)   {
+       } else if (s->oob)   {
                fileio_read(s->fileio, s->oob_size, s->oob, &one_read);
                if (one_read < s->oob_size)
                        memset(s->oob + one_read, 0xff, s->oob_size - one_read);