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

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

diff --git a/src/flash/nand/arm_io.c b/src/flash/nand/arm_io.c
index e319f9585241f95e2ee1781e4ed9335a92303bab..2b0c081bdf274e5d24123e82ca351441e761c49d 100644 (file)
--- a/src/flash/nand/arm_io.c
+++ b/src/flash/nand/arm_io.c
@@ -55,7 +55,7 @@ static int arm_code_to_working_area(struct target *target,
         */
 
        /* make sure we have a working area */
-       if (NULL == *area) {
+       if (!*area) {
                retval = target_alloc_working_area(target, size, area);
                if (retval != ERROR_OK) {
                        LOG_DEBUG("%s: no %d byte buffer", __func__, (int) size);
@@ -173,7 +173,7 @@ int arm_nandwrite(struct arm_nand_data *nand, uint8_t *data, int size)
        buf_set_u32(reg_params[2].value, 0, 32, size);
 
        /* armv4 must exit using a hardware breakpoint */
-       if (arm->is_armv4)
+       if (arm->arch == ARM_ARCH_V4)
                exit_var = nand->copy_area->address + target_code_size - 4;
 
        /* use alg to write data from work area to NAND chip */
@@ -279,7 +279,7 @@ int arm_nandread(struct arm_nand_data *nand, uint8_t *data, uint32_t size)
        buf_set_u32(reg_params[2].value, 0, 32, size);
 
        /* armv4 must exit using a hardware breakpoint */
-       if (arm->is_armv4)
+       if (arm->arch == ARM_ARCH_V4)
                exit_var = nand->copy_area->address + target_code_size - 4;
 
        /* use alg to write data from NAND chip to work area */