mm/dmapool.c: remove redundant NULL check for dev in dma_pool_create()

[mirror_ubuntu-artful-kernel.git] / mm / dmapool.c

diff --git a/mm/dmapool.c b/mm/dmapool.c
index c69781e97cf968076583cc29ef1dbfa53a535c46..a3a1bfe91110d23a7e85e53c77a44caf5709f993 100644 (file)
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -170,24 +170,16 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
        retval->boundary = boundary;
        retval->allocation = allocation;
 
-       if (dev) {
-               int ret;
+       INIT_LIST_HEAD(&retval->pools);
 
-               mutex_lock(&pools_lock);
-               if (list_empty(&dev->dma_pools))
-                       ret = device_create_file(dev, &dev_attr_pools);
-               else
-                       ret = 0;
-               /* note:  not currently insisting "name" be unique */
-               if (!ret)
-                       list_add(&retval->pools, &dev->dma_pools);
-               else {
-                       kfree(retval);
-                       retval = NULL;
-               }
-               mutex_unlock(&pools_lock);
+       mutex_lock(&pools_lock);
+       if (list_empty(&dev->dma_pools) &&
+           device_create_file(dev, &dev_attr_pools)) {
+               kfree(retval);
+               return NULL;
        } else
-               INIT_LIST_HEAD(&retval->pools);
+               list_add(&retval->pools, &dev->dma_pools);
+       mutex_unlock(&pools_lock);
 
        return retval;
 }
@@ -341,10 +333,10 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
                                continue;
                        if (pool->dev)
                                dev_err(pool->dev,
-                                       "dma_pool_alloc %s, %p (corruped)\n",
+                                       "dma_pool_alloc %s, %p (corrupted)\n",
                                        pool->name, retval);
                        else
-                               pr_err("dma_pool_alloc %s, %p (corruped)\n",
+                               pr_err("dma_pool_alloc %s, %p (corrupted)\n",
                                        pool->name, retval);
 
                        /*