openocd: fix simple cases of Yoda condition

There are ~900 Yoda conditions to be aligned to the coding style.
For recurrent Yoda conditions it's preferable using a trivial
script in order to minimize the review effort.
E.g. comparison of uppercase macro/enum with lowercase variable:
	- ...(ERROR_OK == retval)...
	+ ...(retval == ERROR_OK)...

Patch generated automatically with the command:
	sed -i \
	's/(\([A-Z][A-Z0-9_]*\) \([=!]=\) \([a-z][a-z0-9_]*\))/(\3 \2 \1)/g' \
	$(find src/ -type f)

While there, remove the braces {} around a single statement block
to prevent warning from checkpatch.

Change-Id: If585b0a4b4578879c87b2dd74d9e0025e275ec6b
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/6354
Tested-by: jenkins
Reviewed-by: Xiang W <wxjstz@126.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/src/flash/nor/cc26xx.c b/src/flash/nor/cc26xx.c
index 4d58daa..250fc37 100644
--- a/src/flash/nor/cc26xx.c
+++ b/src/flash/nor/cc26xx.c
@@ -107,9 +107,9 @@ static int cc26xx_wait_algo_done(struct flash_bank *bank, uint32_t params_addr)
 	int retval = ERROR_OK;
 
 	start_ms = timeval_ms();
-	while (CC26XX_BUFFER_FULL == status) {
+	while (status == CC26XX_BUFFER_FULL) {
 		retval = target_read_u32(target, status_addr, &status);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			return retval;
 
 		elapsed_ms = timeval_ms() - start_ms;
@@ -119,7 +119,7 @@ static int cc26xx_wait_algo_done(struct flash_bank *bank, uint32_t params_addr)
 			break;
 	};
 
-	if (CC26XX_BUFFER_EMPTY != status) {
+	if (status != CC26XX_BUFFER_EMPTY) {
 		LOG_ERROR("%s: Flash operation failed", cc26xx_bank->family_name);
 		return ERROR_FAIL;
 	}
@@ -136,7 +136,7 @@ static int cc26xx_init(struct flash_bank *bank)
 
 	/* Make sure we've probed the flash to get the device and size */
 	retval = cc26xx_auto_probe(bank);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Check for working area to use for flash helper algorithm */
@@ -144,7 +144,7 @@ static int cc26xx_init(struct flash_bank *bank)
 		target_free_working_area(target, cc26xx_bank->working_area);
 	retval = target_alloc_working_area(target, cc26xx_bank->algo_working_size,
 				&cc26xx_bank->working_area);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Confirm the defined working address is the area we need to use */
@@ -154,7 +154,7 @@ static int cc26xx_init(struct flash_bank *bank)
 	/* Write flash helper algorithm into target memory */
 	retval = target_write_buffer(target, CC26XX_ALGO_BASE_ADDRESS,
 				cc26xx_bank->algo_size, cc26xx_bank->algo_code);
-	if (ERROR_OK != retval) {
+	if (retval != ERROR_OK) {
 		LOG_ERROR("%s: Failed to load flash helper algorithm",
 			cc26xx_bank->family_name);
 		target_free_working_area(target, cc26xx_bank->working_area);
@@ -168,7 +168,7 @@ static int cc26xx_init(struct flash_bank *bank)
 	/* Begin executing the flash helper algorithm */
 	retval = target_start_algorithm(target, 0, NULL, 0, NULL,
 				CC26XX_ALGO_BASE_ADDRESS, 0, &cc26xx_bank->armv7m_info);
-	if (ERROR_OK != retval) {
+	if (retval != ERROR_OK) {
 		LOG_ERROR("%s: Failed to start flash helper algorithm",
 			cc26xx_bank->family_name);
 		target_free_working_area(target, cc26xx_bank->working_area);
@@ -217,7 +217,7 @@ static int cc26xx_mass_erase(struct flash_bank *bank)
 	}
 
 	retval = cc26xx_init(bank);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Initialize algorithm parameters */
@@ -231,7 +231,7 @@ static int cc26xx_mass_erase(struct flash_bank *bank)
 				sizeof(algo_params), (uint8_t *)&algo_params);
 
 	/* Wait for command to complete */
-	if (ERROR_OK == retval)
+	if (retval == ERROR_OK)
 		retval = cc26xx_wait_algo_done(bank, cc26xx_bank->params_addr[0]);
 
 	/* Regardless of errors, try to close down algo */
@@ -290,7 +290,7 @@ static int cc26xx_erase(struct flash_bank *bank, unsigned int first,
 	length = (last - first + 1) * cc26xx_bank->sector_length;
 
 	retval = cc26xx_init(bank);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Set up algorithm parameters for erase command */
@@ -304,7 +304,7 @@ static int cc26xx_erase(struct flash_bank *bank, unsigned int first,
 				sizeof(algo_params), (uint8_t *)&algo_params);
 
 	/* If no error, wait for erase to finish */
-	if (ERROR_OK == retval)
+	if (retval == ERROR_OK)
 		retval = cc26xx_wait_algo_done(bank, cc26xx_bank->params_addr[0]);
 
 	/* Regardless of errors, try to close down algo */
@@ -333,7 +333,7 @@ static int cc26xx_write(struct flash_bank *bank, const uint8_t *buffer,
 	}
 
 	retval = cc26xx_init(bank);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 
 	/* Initialize algorithm parameters to default values */
@@ -354,7 +354,7 @@ static int cc26xx_write(struct flash_bank *bank, const uint8_t *buffer,
 		/* Put next block of data to flash into buffer */
 		retval = target_write_buffer(target, cc26xx_bank->buffer_addr[index],
 					size, buffer);
-		if (ERROR_OK != retval) {
+		if (retval != ERROR_OK) {
 			LOG_ERROR("Unable to write data to target memory");
 			break;
 		}
@@ -367,13 +367,13 @@ static int cc26xx_write(struct flash_bank *bank, const uint8_t *buffer,
 		/* Issue flash helper algorithm parameters for block write */
 		retval = target_write_buffer(target, cc26xx_bank->params_addr[index],
 					sizeof(algo_params[index]), (uint8_t *)&algo_params[index]);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			break;
 
 		/* Wait for next ping pong buffer to be ready */
 		index ^= 1;
 		retval = cc26xx_wait_algo_done(bank, cc26xx_bank->params_addr[index]);
-		if (ERROR_OK != retval)
+		if (retval != ERROR_OK)
 			break;
 
 		count -= size;
@@ -386,7 +386,7 @@ static int cc26xx_write(struct flash_bank *bank, const uint8_t *buffer,
 	}
 
 	/* If no error yet, wait for last buffer to finish */
-	if (ERROR_OK == retval) {
+	if (retval == ERROR_OK) {
 		index ^= 1;
 		retval = cc26xx_wait_algo_done(bank, cc26xx_bank->params_addr[index]);
 	}
@@ -410,12 +410,12 @@ static int cc26xx_probe(struct flash_bank *bank)
 	int retval;
 
 	retval = target_read_u32(target, FCFG1_ICEPICK_ID, &value);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 	cc26xx_bank->icepick_id = value;
 
 	retval = target_read_u32(target, FCFG1_USER_ID, &value);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 	cc26xx_bank->user_id = value;
 
@@ -454,7 +454,7 @@ static int cc26xx_probe(struct flash_bank *bank)
 	}
 
 	retval = target_read_u32(target, CC26XX_FLASH_SIZE_INFO, &value);
-	if (ERROR_OK != retval)
+	if (retval != ERROR_OK)
 		return retval;
 	num_sectors = value & 0xff;
 	if (num_sectors > max_sectors)