commit 74f7da1bb41ae9e94b95bb44c268e8261c1fc564
author Kuo-Lang Tseng <kuo-lang.tseng@intel.com> Tue Jan 17 17:04:53 2017 -0800
committer Anas Nashif <nashif@linux.intel.com> Wed Feb 08 19:07:42 2017 +0000
tree 6f02f54985c6ff86ca5a0112944f2b882e37dbdc
parent 164ba8c5cdd9c112b889f5e0d8e2368b77268524

drivers: QMSI SOC flash: simplify driver reentrancy code using IS_ENABLED

This is one the series patches that simplifies the driver code by
using the IS_ENABLED macro. This removes the need of the const
variable and the wrapper functions on semaphore APIs.

Jira: ZEP-1251

Change-Id: I59802cf9f482337656b0fdc4b272f3b1ddc6cbda
Signed-off-by: Kuo-Lang Tseng <kuo-lang.tseng@intel.com>

drivers/flash/soc_flash_qmsi.c

diff --git a/drivers/flash/soc_flash_qmsi.c b/drivers/flash/soc_flash_qmsi.c
index 1f40273..bfa8c1b 100644
--- a/drivers/flash/soc_flash_qmsi.c
+++ b/drivers/flash/soc_flash_qmsi.c
@@ -10,6 +10,7 @@
 #include <init.h>
 
 #include <flash.h>
+#include <misc/util.h>
 
 #include "qm_flash.h"
 #include "qm_soc_regs.h"
@@ -37,41 +38,11 @@
 #endif /* FLASH_HAS_CONTEXT_DATA */
 
 #ifdef CONFIG_SOC_FLASH_QMSI_API_REENTRANCY
-static const int reentrancy_protection = 1;
 #define RP_GET(dev) (&((struct soc_flash_data *)(dev->driver_data))->sem)
 #else
-static const int reentrancy_protection;
 #define RP_GET(dev) (NULL)
 #endif
 
-static void flash_reentrancy_init(struct device *dev)
-{
-	if (!reentrancy_protection) {
-		return;
-	}
-
-	k_sem_init(RP_GET(dev), 0, UINT_MAX);
-	k_sem_give(RP_GET(dev));
-}
-
-static void flash_critical_region_start(struct device *dev)
-{
-	if (!reentrancy_protection) {
-		return;
-	}
-
-	k_sem_take(RP_GET(dev), K_FOREVER);
-}
-
-static void flash_critical_region_end(struct device *dev)
-{
-	if (!reentrancy_protection) {
-		return;
-	}
-
-	k_sem_give(RP_GET(dev));
-}
-
 static inline bool is_aligned_32(uint32_t data)
 {
 	return (data & 0x3) ? false : true;
@@ -185,9 +156,15 @@
 		}
 #endif
 
-		flash_critical_region_start(dev);
+		if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+			k_sem_take(RP_GET(dev), K_FOREVER);
+		}
+
 		qm_flash_word_write(flash, reg, offset, data_word);
-		flash_critical_region_end(dev);
+
+		if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+			k_sem_give(RP_GET(dev));
+		}
 	}
 
 	return 0;
@@ -229,9 +206,15 @@
 				     (QM_FLASH_PAGE_SIZE_BITS + 1));
 		}
 #endif
-		flash_critical_region_start(dev);
+		if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+			k_sem_take(RP_GET(dev), K_FOREVER);
+		}
+
 		qm_flash_page_erase(flash, reg, page);
-		flash_critical_region_end(dev);
+
+		if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+			k_sem_give(RP_GET(dev));
+		}
 	}
 
 	return 0;
@@ -250,14 +233,19 @@
 		qm_cfg.write_disable = QM_FLASH_WRITE_ENABLE;
 	}
 
-	flash_critical_region_start(dev);
+	if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+		k_sem_take(RP_GET(dev), K_FOREVER);
+	}
+
 	qm_flash_set_config(QM_FLASH_0, &qm_cfg);
 
 #if defined(CONFIG_SOC_QUARK_SE_C1000)
 	qm_flash_set_config(QM_FLASH_1, &qm_cfg);
 #endif
 
-	flash_critical_region_end(dev);
+	if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+		k_sem_give(RP_GET(dev));
+	}
 
 	return 0;
 }
@@ -347,7 +335,10 @@
 	qm_flash_set_config(QM_FLASH_1, &qm_cfg);
 #endif
 
-	flash_reentrancy_init(dev);
+	if (IS_ENABLED(CONFIG_SOC_FLASH_QMSI_API_REENTRANCY)) {
+		k_sem_init(RP_GET(dev), 0, UINT_MAX);
+		k_sem_give(RP_GET(dev));
+	}
 
 	flash_qmsi_set_power_state(dev, DEVICE_PM_ACTIVE_STATE);