Commit 9f297db3 authored by Keith Busch's avatar Keith Busch Committed by Andrew Morton
Browse files

dmapool: create/destroy cleanup 

Set the 'empty' bool directly from the result of the function that
determines its value instead of adding additional logic.

Link: https://lkml.kernel.org/r/20230126215125.4069751-13-kbusch@meta.com


Fixes: 2d55c16c ("dmapool: create/destroy cleanup")
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Tony Battersby <tonyb@cybernetics.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent adef0803

mm/dmapool.c

+4 −6
Original line number Diff line number Diff line
@@ -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);