Merge tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-microblaze.git] / mm / dmapool.c

diff --git a/mm/dmapool.c b/mm/dmapool.c
index d2b0f8f..a151a21 100644 (file)
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -226,7 +226,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
 {
        struct dma_pool *retval;
        size_t allocation;
-       bool empty = false;
+       bool empty;
 
        if (!dev)
                return NULL;
@@ -276,8 +276,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
         */
        mutex_lock(&pools_reg_lock);
        mutex_lock(&pools_lock);
-       if (list_empty(&dev->dma_pools))
-               empty = true;
+       empty = list_empty(&dev->dma_pools);
        list_add(&retval->pools, &dev->dma_pools);
        mutex_unlock(&pools_lock);
        if (empty) {
@@ -361,7 +360,7 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
 void dma_pool_destroy(struct dma_pool *pool)
 {
        struct dma_page *page, *tmp;
-       bool empty = false, busy = false;
+       bool empty, busy = false;
 
        if (unlikely(!pool))
                return;
@@ -369,8 +368,7 @@ void dma_pool_destroy(struct dma_pool *pool)
        mutex_lock(&pools_reg_lock);
        mutex_lock(&pools_lock);
        list_del(&pool->pools);
-       if (list_empty(&pool->dev->dma_pools))
-               empty = true;
+       empty = list_empty(&pool->dev->dma_pools);
        mutex_unlock(&pools_lock);
        if (empty)
                device_remove_file(pool->dev, &dev_attr_pools);