pm: Replace pm_lock/pm_unlock with enter_critical_section

- Remove pm_lock/pm_unlock macros from pm.h
- Use enter_critical_section in pm_register/pm_unregister
- Remove pm_lock/pm_unlock calls from pm_metrics

Signed-off-by: Eunwoo Nam <eunwoo.nam@samsung.com>

Author: ewoodev

os/pm/pm.h

@@ -67,28 +67,6 @@
 
 #ifdef CONFIG_PM
 
-/* Function-like macros *****************************************************/
-/****************************************************************************
- * Name: pm_lock
- *
- * Descripton:
- *   Lock the power management registry.  NOTE: This function may return
- *   an error if a signal is received while what (errno == EINTR).
- *
- ****************************************************************************/
-
-#define pm_lock() sem_wait(&g_pmglobals.regsem);
-
-/****************************************************************************
- * Name: pm_unlock
- *
- * Descripton:
- *   Unlock the power management registry.
- *
- ****************************************************************************/
-
-#define pm_unlock() sem_post(&g_pmglobals.regsem);
-
 /****************************************************************************
  * Public Types
  ****************************************************************************/

os/pm/pm_metrics.c

@@ -295,23 +295,22 @@ int pm_metrics(int milliseconds)
 		pmdbg("Please Start PM to enable PM Metrics\n");
 		return OK;
 	}
-	/* Lock PM so that no two thread can run PM Metrics simultaneously */
-	pm_lock();
 
 	/* Allocate memory for initializing PM Metrics measurements */
 	g_pm_metrics = (pm_metric_t *)kmm_calloc(1, sizeof(pm_metric_t));
 	if (g_pm_metrics == NULL) {
 		set_errno(ENOMEM);
 		pmdbg("Unable to initialize pm_metrics, error = %d\n", get_errno());
-		pm_unlock();
 		return ERROR;
 	}
+
+	flags = enter_critical_section();
+
 	/* PM Metrics Initialization */
 	for (index = 0; index < PM_COUNT; index++) {
 		g_pm_metrics->state_metrics.state_accum_ticks[index] = 0;
 	}
 
-	flags = enter_critical_section();
 	start_time = clock_systimer();
 	g_pm_metrics->state_metrics.stime = start_time;
 
@@ -348,7 +347,5 @@ int pm_metrics(int milliseconds)
 	kmm_free(g_pm_metrics);
 	g_pm_metrics = NULL;
 
-	/* Unlock PM Metrics for other threads */
-	pm_unlock();
 	return OK;
 }

os/pm/pm_register.c

@@ -85,19 +85,18 @@
 
 int pm_register(FAR struct pm_callback_s *callbacks)
 {
-	int ret;
+	irqstate_t flags;
 
 	DEBUGASSERT(callbacks);
 
+	flags = enter_critical_section();
+
 	/* Add the new entry to the end of the list of registered callbacks */
+	dq_addlast(&callbacks->entry, &g_pmglobals.registry);
 
-	ret = pm_lock();
-	if (ret == OK) {
-		dq_addlast(&callbacks->entry, &g_pmglobals.registry);
-		pm_unlock();
-	}
+	leave_critical_section(flags);
 
-	return ret;
+	return OK;
 }
 
 #endif /* CONFIG_PM */

os/pm/pm_unregister.c

@@ -85,19 +85,18 @@
 
 int pm_unregister(FAR struct pm_callback_s *callbacks)
 {
-	int ret;
+	irqstate_t flags;
 
 	DEBUGASSERT(callbacks);
 
+	flags = enter_critical_section();
+
 	/* Remove entry from the list of registered callbacks. */
+	dq_rem(&callbacks->entry, &g_pmglobals.registry);
 
-	ret = pm_lock();
-	if (ret == OK) {
-		dq_rem(&callbacks->entry, &g_pmglobals.registry);
-		pm_unlock();
-	}
+	leave_critical_section(flags);
 
-	return ret;
+	return OK;
 }
 
 #endif /* CONFIG_PM */