diff --git a/mm/mempool/mempool.c b/mm/mempool/mempool.c
index 1b8d764c31..1c2bd0e743 100644
--- a/mm/mempool/mempool.c
+++ b/mm/mempool/mempool.c
@@ -88,12 +88,10 @@ static inline void mempool_mfree(FAR struct mempool_s *pool, FAR void *addr)
 
 int mempool_init(FAR struct mempool_s *pool, FAR const char *name)
 {
+  FAR sq_entry_t *base;
   size_t count;
 
-  if (pool == NULL || pool->bsize == 0)
-    {
-      return -EINVAL;
-    }
+  DEBUGASSERT(pool != NULL && pool->bsize != 0);
 
   pool->nused = 0;
   sq_init(&pool->list);
@@ -101,25 +99,20 @@ int mempool_init(FAR struct mempool_s *pool, FAR const char *name)
   sq_init(&pool->elist);
 
   count = pool->ninitial + pool->ninterrupt;
-  if (count != 0)
+  base = mempool_malloc(pool, sizeof(*base) +
+                        pool->bsize * count);
+  if (base == NULL)
     {
-      FAR sq_entry_t *base;
-
-      base = mempool_malloc(pool, sizeof(*base) +
-                            pool->bsize * count);
-      if (base == NULL)
-        {
-          return -ENOMEM;
-        }
-
-      sq_addfirst(base, &pool->elist);
-      mempool_add_list(&pool->ilist, base + 1,
-                       pool->ninterrupt, pool->bsize);
-      mempool_add_list(&pool->list, (FAR char *)(base + 1) +
-                       pool->ninterrupt * pool->bsize,
-                       pool->ninitial, pool->bsize);
+      return -ENOMEM;
     }
 
+  sq_addfirst(base, &pool->elist);
+  mempool_add_list(&pool->ilist, base + 1,
+                   pool->ninterrupt, pool->bsize);
+  mempool_add_list(&pool->list, (FAR char *)(base + 1) +
+                   pool->ninterrupt * pool->bsize,
+                   pool->ninitial, pool->bsize);
+
   if (pool->wait && pool->nexpand == 0)
     {
       nxsem_init(&pool->waitsem, 0, 0);
@@ -154,10 +147,7 @@ FAR void *mempool_alloc(FAR struct mempool_s *pool)
   FAR sq_entry_t *blk;
   irqstate_t flags;
 
-  if (pool == NULL)
-    {
-      return NULL;
-    }
+  DEBUGASSERT(pool != NULL);
 
 retry:
   flags = spin_lock_irqsave(&pool->lock);
@@ -223,19 +213,24 @@ out_with_lock:
 void mempool_free(FAR struct mempool_s *pool, FAR void *blk)
 {
   irqstate_t flags;
-  FAR char *base;
 
-  if (blk == NULL || pool == NULL)
-    {
-      return;
-    }
+  DEBUGASSERT(pool != NULL && blk != NULL);
 
   flags = spin_lock_irqsave(&pool->lock);
-  base = (FAR char *)(sq_peek(&pool->elist) + 1);
-  if (pool->ninterrupt && (FAR char *)blk >= base &&
-      (FAR char *)blk < base + pool->ninterrupt * pool->bsize)
+  if (pool->ninterrupt)
     {
-      sq_addfirst(blk, &pool->ilist);
+      FAR char *base;
+
+      base = (FAR char *)(sq_peek(&pool->elist) + 1);
+      if ((FAR char *)blk >= base &&
+          (FAR char *)blk < base + pool->ninterrupt * pool->bsize)
+        {
+          sq_addfirst(blk, &pool->ilist);
+        }
+      else
+        {
+          sq_addfirst(blk, &pool->list);
+        }
     }
   else
     {
@@ -274,10 +269,7 @@ int mempool_info(FAR struct mempool_s *pool, FAR struct mempoolinfo_s *info)
 {
   irqstate_t flags;
 
-  if (pool == NULL || info == NULL)
-    {
-      return -EINVAL;
-    }
+  DEBUGASSERT(pool != NULL && info != NULL);
 
   flags = spin_lock_irqsave(&pool->lock);
   info->ordblks = sq_count(&pool->list);
@@ -315,10 +307,7 @@ int mempool_deinit(FAR struct mempool_s *pool)
 {
   FAR sq_entry_t *blk;
 
-  if (pool == NULL)
-    {
-      return -EINVAL;
-    }
+  DEBUGASSERT(pool != NULL);
 
   if (pool->nused != 0)
     {
diff --git a/mm/mempool/mempool_multiple.c b/mm/mempool/mempool_multiple.c
index 417067eed1..1114c26454 100644
--- a/mm/mempool/mempool_multiple.c
+++ b/mm/mempool/mempool_multiple.c
@@ -32,7 +32,6 @@
 #define SIZEOF_HEAD sizeof(FAR struct mempool_s *)
 #define MAX(a, b)   ((a) > (b) ? (a) : (b))
 
-
 /****************************************************************************
  * Private Functions
  ****************************************************************************/
@@ -57,7 +56,7 @@ mempool_multiple_find(FAR struct mempool_multiple_s *mpool, size_t size)
 
           low = ++mid;
         }
-      else if (n == 0 || size == mid->bsize)
+      else if (size == mid->bsize || n == 0)
         {
           return mid;
         }
@@ -92,10 +91,7 @@ int mempool_multiple_init(FAR struct mempool_multiple_s *mpool,
 {
   int i;
 
-  if (mpool == NULL || mpool->pools == NULL)
-    {
-      return -EINVAL;
-    }
+  DEBUGASSERT(mpool != NULL && mpool->pools != NULL);
 
   for (i = 0; i < mpool->npools; i++)
     {
@@ -135,22 +131,21 @@ int mempool_multiple_init(FAR struct mempool_multiple_s *mpool,
 FAR void *mempool_multiple_alloc(FAR struct mempool_multiple_s *mpool,
                                  size_t size)
 {
+  FAR struct mempool_s *end = mpool->pools + mpool->npools;
   FAR struct mempool_s *pool;
 
   pool = mempool_multiple_find(mpool, size + SIZEOF_HEAD);
-  if (pool != NULL)
+  DEBUGASSERT(pool != NULL);
+  do
     {
-      do
+      FAR void *blk = mempool_alloc(pool);
+      if (blk != NULL)
         {
-          FAR void *blk = mempool_alloc(pool);
-          if (blk != NULL)
-            {
-              *(FAR struct mempool_s **)blk = pool;
-              return (FAR char *)blk + SIZEOF_HEAD;
-            }
+          *(FAR struct mempool_s **)blk = pool;
+          return (FAR char *)blk + SIZEOF_HEAD;
         }
-      while (++pool< mpool->pools + mpool->npools);
     }
+  while (++pool< end);
 
   return NULL;
 }
@@ -173,13 +168,11 @@ void mempool_multiple_free(FAR struct mempool_multiple_s *mpool,
   FAR struct mempool_s *pool;
   FAR void *mem;
 
-  if (blk != NULL)
-    {
-      mem = (FAR char *)blk - SIZEOF_HEAD;
-      pool = *(FAR struct mempool_s **)mem;
+  DEBUGASSERT(mpool != NULL && blk != NULL);
 
-      mempool_free(pool, mem);
-    }
+  mem = (FAR char *)blk - SIZEOF_HEAD;
+  pool = *(FAR struct mempool_s **)mem;
+  mempool_free(pool, mem);
 }
 
 /****************************************************************************
@@ -205,12 +198,8 @@ FAR void *mempool_multiple_fixed_alloc(FAR struct mempool_multiple_s *mpool,
   FAR struct mempool_s *pool;
 
   pool = mempool_multiple_find(mpool, size);
-  if (pool != NULL)
-    {
-      return mempool_alloc(pool);
-    }
-
-  return NULL;
+  DEBUGASSERT(pool != NULL);
+  return mempool_alloc(pool);
 }
 
 /****************************************************************************
@@ -229,14 +218,13 @@ FAR void *mempool_multiple_fixed_alloc(FAR struct mempool_multiple_s *mpool,
 void mempool_multiple_fixed_free(FAR struct mempool_multiple_s *mpool,
                                  FAR void *blk, size_t size)
 {
-  if (blk != NULL)
-    {
-      FAR struct mempool_s *pool = mempool_multiple_find(mpool, size);
-      if (pool != NULL)
-        {
-          mempool_free(pool, blk);
-        }
-    }
+  FAR struct mempool_s *pool;
+
+  DEBUGASSERT(mpool != NULL && blk != NULL);
+
+  pool = mempool_multiple_find(mpool, size);
+  DEBUGASSERT(pool != NULL);
+  mempool_free(pool, blk);
 }
 
 /****************************************************************************
@@ -257,10 +245,7 @@ int mempool_multiple_deinit(FAR struct mempool_multiple_s *mpool)
 {
   int i;
 
-  if (mpool == NULL)
-    {
-      return -EINVAL;
-    }
+  DEBUGASSERT(mpool != NULL);
 
   for (i = 0; i < mpool->npools; i++)
     {