jtagspi: fix build on MacOS

[openocd.git] / src / flash / nor / xcf.c

diff --git a/src/flash/nor/xcf.c b/src/flash/nor/xcf.c
index 1220a1ef29b2557e15a3ad81337fc7ff136512a9..c6de1aca11d16ab29bbc642b9e799d3a438a3e84 100644 (file)
--- a/src/flash/nor/xcf.c
+++ b/src/flash/nor/xcf.c
@@ -475,7 +475,7 @@ static int read_write_data(struct flash_bank *bank, const uint8_t *w_buffer,
                                w_buffer += len;
                                sector_bytes -= len;
                                ret = isc_program_data_page(bank, page_buf);
-                               if (ERROR_OK != ret)
+                               if (ret != ERROR_OK)
                                        goto EXIT;
                                else {
                                        LOG_DEBUG("written %d bytes from %d", dbg_written, dbg_count);
@@ -494,7 +494,7 @@ static int read_write_data(struct flash_bank *bank, const uint8_t *w_buffer,
        if (write_flag) {
                for (unsigned int i = 0; i < bank->num_sectors; i++) {
                        ret = isc_set_data_done(bank, i);
-                       if (ERROR_OK != ret)
+                       if (ret != ERROR_OK)
                                goto EXIT;
                }
        }
@@ -572,7 +572,7 @@ FLASH_BANK_COMMAND_HANDLER(xcf_flash_bank_command)
        struct xcf_priv *priv;
 
        priv = malloc(sizeof(struct xcf_priv));
-       if (priv == NULL) {
+       if (!priv) {
                LOG_ERROR("no memory for flash bank info");
                return ERROR_FAIL;
        }
@@ -602,7 +602,7 @@ static int xcf_probe(struct flash_bank *bank)
                free(bank->sectors);
        priv->probed = false;
 
-       if (bank->target->tap == NULL) {
+       if (!bank->target->tap) {
                LOG_ERROR("Target has no JTAG tap");
                return ERROR_FAIL;
        }
@@ -629,7 +629,7 @@ static int xcf_probe(struct flash_bank *bank)
        }
 
        bank->sectors = malloc(bank->num_sectors * sizeof(struct flash_sector));
-       if (bank->sectors == NULL) {
+       if (!bank->sectors) {
                LOG_ERROR("No memory for sector table");
                return ERROR_FAIL;
        }
@@ -755,7 +755,7 @@ COMMAND_HANDLER(xcf_handle_ccb_command) {
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        uint16_t ccb = 0xFFFF;
@@ -800,29 +800,29 @@ COMMAND_HANDLER(xcf_handle_ccb_command) {
                sector = gucr_num(bank);
                isc_clear_protect(bank, sector, sector);
                int ret = isc_erase_sectors(bank, sector, sector);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
                ret = isc_program_ccb(bank, ccb);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
                ret = isc_program_single_revision_btc(bank);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
                ret = isc_set_data_done(bank, sector);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
 
                /* SUCR sector */
                sector = sucr_num(bank);
                isc_clear_protect(bank, sector, sector);
                ret = isc_erase_sectors(bank, sector, sector);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
                ret = isc_program_singe_revision_sucr(bank);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
                ret = isc_set_data_done(bank, sector);
-               if (ERROR_OK != ret)
+               if (ret != ERROR_OK)
                        goto EXIT;
 
 EXIT:
@@ -838,7 +838,7 @@ COMMAND_HANDLER(xcf_handle_configure_command) {
 
        struct flash_bank *bank;
        int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
-       if (ERROR_OK != retval)
+       if (retval != ERROR_OK)
                return retval;
 
        return fpga_configure(bank);