diff --git a/drivers/power/activity_governor.c b/drivers/power/activity_governor.c
index 6f4b458342f..0dad1e0acfc 100644
--- a/drivers/power/activity_governor.c
+++ b/drivers/power/activity_governor.c
@@ -508,7 +508,7 @@ static enum pm_state_e governor_checkstate(int domain)
 
   for (index = 0; index < pdomstate->recommended; index++)
     {
-      if (dq_count(&pdom->wakelock[index]) != 0)
+      if (!dq_empty(&pdom->wakelock[index]))
         {
           pdomstate->recommended = index;
           break;
@@ -567,7 +567,7 @@ static void governor_timer(int domain)
   pdomstate = &g_pm_activity_governor.domain_states[domain];
   state     = pdom->state;
 
-  if (state < PM_SLEEP && !dq_count(&pdom->wakelock[state]))
+  if (state < PM_SLEEP && dq_empty(&pdom->wakelock[state]))
     {
       sclock_t delay = pmtick[state] +
                        pdomstate->btime -
diff --git a/drivers/power/greedy_governor.c b/drivers/power/greedy_governor.c
index aa22d20076d..152ec14624b 100644
--- a/drivers/power/greedy_governor.c
+++ b/drivers/power/greedy_governor.c
@@ -122,7 +122,7 @@ static enum pm_state_e greedy_governor_checkstate(int domain)
     {
       /* Find the lowest power-level which is not locked. */
 
-      while (!dq_count(&pdom->wakelock[state]) && state < (PM_COUNT - 1))
+      while (dq_empty(&pdom->wakelock[state]) && state < (PM_COUNT - 1))
         {
           state++;
         }