forked from auracaster/openocd
openocd: fix Yoda conditions with checkpatch
The new checkpatch can automatically fix the code, but this feature is still error prone and not complete. Patch generated automatically through the new checkpatch with flags "--types CONSTANT_COMPARISON --fix-inplace". Some Yoda condition is detected by checkpatch but not fixed; it will be fixed manually in a following commit. Change-Id: Ifaaa1159e63dbd1db6aa3c017125df9874fa9703 Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com> Reviewed-on: http://openocd.zylin.com/6355 Tested-by: jenkins
This commit is contained in:
@@ -93,7 +93,7 @@ static int nds32_v3_debug_entry(struct nds32 *nds32, bool enable_watchpoint)
|
||||
}
|
||||
}
|
||||
|
||||
if (ERROR_OK != nds32_examine_debug_reason(nds32)) {
|
||||
if (nds32_examine_debug_reason(nds32) != ERROR_OK) {
|
||||
nds32->target->state = backup_state;
|
||||
|
||||
/* re-activate all hardware breakpoints & watchpoints */
|
||||
@@ -450,7 +450,7 @@ int nds32_v3_read_buffer(struct target *target, target_addr_t address,
|
||||
struct nds32 *nds32 = target_to_nds32(target);
|
||||
struct nds32_memory *memory = &(nds32->memory);
|
||||
|
||||
if ((NDS_MEMORY_ACC_CPU == memory->access_channel) &&
|
||||
if ((memory->access_channel == NDS_MEMORY_ACC_CPU) &&
|
||||
(target->state != TARGET_HALTED)) {
|
||||
LOG_WARNING("target was not halted");
|
||||
return ERROR_TARGET_NOT_HALTED;
|
||||
@@ -474,7 +474,7 @@ int nds32_v3_read_buffer(struct target *target, target_addr_t address,
|
||||
* Because hardware will turn off IT/DT by default, it MUST translate virtual address
|
||||
* to physical address.
|
||||
*/
|
||||
if (ERROR_OK == target->type->virt2phys(target, address, &physical_address))
|
||||
if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK)
|
||||
address = physical_address;
|
||||
else
|
||||
return ERROR_FAIL;
|
||||
@@ -508,7 +508,7 @@ int nds32_v3_write_buffer(struct target *target, target_addr_t address,
|
||||
struct nds32 *nds32 = target_to_nds32(target);
|
||||
struct nds32_memory *memory = &(nds32->memory);
|
||||
|
||||
if ((NDS_MEMORY_ACC_CPU == memory->access_channel) &&
|
||||
if ((memory->access_channel == NDS_MEMORY_ACC_CPU) &&
|
||||
(target->state != TARGET_HALTED)) {
|
||||
LOG_WARNING("target was not halted");
|
||||
return ERROR_TARGET_NOT_HALTED;
|
||||
@@ -532,7 +532,7 @@ int nds32_v3_write_buffer(struct target *target, target_addr_t address,
|
||||
* Because hardware will turn off IT/DT by default, it MUST translate virtual address
|
||||
* to physical address.
|
||||
*/
|
||||
if (ERROR_OK == target->type->virt2phys(target, address, &physical_address))
|
||||
if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK)
|
||||
address = physical_address;
|
||||
else
|
||||
return ERROR_FAIL;
|
||||
@@ -570,7 +570,7 @@ int nds32_v3_read_memory(struct target *target, target_addr_t address,
|
||||
struct nds32 *nds32 = target_to_nds32(target);
|
||||
struct nds32_memory *memory = &(nds32->memory);
|
||||
|
||||
if ((NDS_MEMORY_ACC_CPU == memory->access_channel) &&
|
||||
if ((memory->access_channel == NDS_MEMORY_ACC_CPU) &&
|
||||
(target->state != TARGET_HALTED)) {
|
||||
LOG_WARNING("target was not halted");
|
||||
return ERROR_TARGET_NOT_HALTED;
|
||||
@@ -594,7 +594,7 @@ int nds32_v3_read_memory(struct target *target, target_addr_t address,
|
||||
* Because hardware will turn off IT/DT by default, it MUST translate virtual address
|
||||
* to physical address.
|
||||
*/
|
||||
if (ERROR_OK == target->type->virt2phys(target, address, &physical_address))
|
||||
if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK)
|
||||
address = physical_address;
|
||||
else
|
||||
return ERROR_FAIL;
|
||||
@@ -628,7 +628,7 @@ int nds32_v3_write_memory(struct target *target, target_addr_t address,
|
||||
struct nds32 *nds32 = target_to_nds32(target);
|
||||
struct nds32_memory *memory = &(nds32->memory);
|
||||
|
||||
if ((NDS_MEMORY_ACC_CPU == memory->access_channel) &&
|
||||
if ((memory->access_channel == NDS_MEMORY_ACC_CPU) &&
|
||||
(target->state != TARGET_HALTED)) {
|
||||
LOG_WARNING("target was not halted");
|
||||
return ERROR_TARGET_NOT_HALTED;
|
||||
@@ -652,7 +652,7 @@ int nds32_v3_write_memory(struct target *target, target_addr_t address,
|
||||
* Because hardware will turn off IT/DT by default, it MUST translate virtual address
|
||||
* to physical address.
|
||||
*/
|
||||
if (ERROR_OK == target->type->virt2phys(target, address, &physical_address))
|
||||
if (target->type->virt2phys(target, address, &physical_address) == ERROR_OK)
|
||||
address = physical_address;
|
||||
else
|
||||
return ERROR_FAIL;
|
||||
|
||||
Reference in New Issue
Block a user