From fdad56ecb02e072245bbcf86d9a6b506149c6a25 Mon Sep 17 00:00:00 2001
From: Marc Schink <dev@zapb.de>
Date: Tue, 28 Jan 2020 21:40:37 +0100
Subject: [PATCH] flash/nor/efm32: Some small code cleanups

Change-Id: I547970ce31435f75bae01d6d2cc96ebc9c15588c
Signed-off-by: Marc Schink <dev@zapb.de>
Reviewed-on: http://openocd.zylin.com/5420
Tested-by: jenkins
Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
---
 src/flash/nor/efm32.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/flash/nor/efm32.c b/src/flash/nor/efm32.c
index 9cdc32573..fe4ddd47e 100644
--- a/src/flash/nor/efm32.c
+++ b/src/flash/nor/efm32.c
@@ -99,7 +99,7 @@ struct efm32_family_data {
 };
 
 struct efm32x_flash_bank {
-	int probed;
+	bool probed;
 	uint32_t lb_page[LOCKBITS_PAGE_SZ/4];
 	uint32_t reg_base;
 	uint32_t reg_lock;
@@ -351,7 +351,7 @@ FLASH_BANK_COMMAND_HANDLER(efm32x_flash_bank_command)
 	efm32x_info = malloc(sizeof(struct efm32x_flash_bank));
 
 	bank->driver_priv = efm32x_info;
-	efm32x_info->probed = 0;
+	efm32x_info->probed = false;
 	memset(efm32x_info->lb_page, 0xff, LOCKBITS_PAGE_SZ);
 
 	return ERROR_OK;
@@ -470,7 +470,6 @@ static int efm32x_erase_page(struct flash_bank *bank, uint32_t addr)
 static int efm32x_erase(struct flash_bank *bank, int first, int last)
 {
 	struct target *target = bank->target;
-	int i = 0;
 	int ret = 0;
 
 	if (TARGET_HALTED != target->state) {
@@ -485,7 +484,7 @@ static int efm32x_erase(struct flash_bank *bank, int first, int last)
 		return ret;
 	}
 
-	for (i = first; i <= last; i++) {
+	for (int i = first; i <= last; i++) {
 		ret = efm32x_erase_page(bank, bank->sectors[i].offset);
 		if (ERROR_OK != ret)
 			LOG_ERROR("Failed to erase page %d", i);
@@ -501,7 +500,6 @@ static int efm32x_read_lock_data(struct flash_bank *bank)
 {
 	struct efm32x_flash_bank *efm32x_info = bank->driver_priv;
 	struct target *target = bank->target;
-	int i = 0;
 	int data_size = 0;
 	uint32_t *ptr = NULL;
 	int ret = 0;
@@ -513,7 +511,7 @@ static int efm32x_read_lock_data(struct flash_bank *bank)
 
 	ptr = efm32x_info->lb_page;
 
-	for (i = 0; i < data_size; i++, ptr++) {
+	for (int i = 0; i < data_size; i++, ptr++) {
 		ret = target_read_u32(target, EFM32_MSC_LOCK_BITS+i*4, ptr);
 		if (ERROR_OK != ret) {
 			LOG_ERROR("Failed to read PLW %d", i);
@@ -619,7 +617,6 @@ static int efm32x_set_page_lock(struct flash_bank *bank, size_t page, int set)
 static int efm32x_protect(struct flash_bank *bank, int set, int first, int last)
 {
 	struct target *target = bank->target;
-	int i = 0;
 	int ret = 0;
 
 	if (!set) {
@@ -632,7 +629,7 @@ static int efm32x_protect(struct flash_bank *bank, int set, int first, int last)
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	for (i = first; i <= last; i++) {
+	for (int i = first; i <= last; i++) {
 		ret = efm32x_set_page_lock(bank, i, set);
 		if (ERROR_OK != ret) {
 			LOG_ERROR("Failed to set lock on page %d", i);
@@ -963,11 +960,10 @@ static int efm32x_probe(struct flash_bank *bank)
 	struct efm32x_flash_bank *efm32x_info = bank->driver_priv;
 	struct efm32_info efm32_mcu_info;
 	int ret;
-	int i;
 	uint32_t base_address = 0x00000000;
 	char buf[256];
 
-	efm32x_info->probed = 0;
+	efm32x_info->probed = false;
 	memset(efm32x_info->lb_page, 0xff, LOCKBITS_PAGE_SZ);
 
 	ret = efm32x_read_info(bank, &efm32_mcu_info);
@@ -1006,14 +1002,14 @@ static int efm32x_probe(struct flash_bank *bank)
 
 	bank->sectors = malloc(sizeof(struct flash_sector) * num_pages);
 
-	for (i = 0; i < num_pages; i++) {
+	for (int i = 0; i < num_pages; i++) {
 		bank->sectors[i].offset = i * efm32_mcu_info.page_size;
 		bank->sectors[i].size = efm32_mcu_info.page_size;
 		bank->sectors[i].is_erased = -1;
 		bank->sectors[i].is_protected = 1;
 	}
 
-	efm32x_info->probed = 1;
+	efm32x_info->probed = true;
 
 	return ERROR_OK;
 }
@@ -1030,7 +1026,6 @@ static int efm32x_protect_check(struct flash_bank *bank)
 {
 	struct target *target = bank->target;
 	int ret = 0;
-	int i = 0;
 
 	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
@@ -1045,7 +1040,7 @@ static int efm32x_protect_check(struct flash_bank *bank)
 
 	assert(NULL != bank->sectors);
 
-	for (i = 0; i < bank->num_sectors; i++)
+	for (int i = 0; i < bank->num_sectors; i++)
 		bank->sectors[i].is_protected = efm32x_get_page_lock(bank, i);
 
 	return ERROR_OK;