1 files changed, 72 insertions, 65 deletions

diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
index eeaaf5fca105..15c33cc34a80 100644
--- a/drivers/misc/sram.c
+++ b/drivers/misc/sram.c
@@ -18,23 +18,20 @@
  * MA 02110-1301, USA.
  */
 
-#include <linux/kernel.h>
-#include <linux/init.h>
 #include <linux/clk.h>
-#include <linux/err.h>
+#include <linux/genalloc.h>
 #include <linux/io.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/list.h>
 #include <linux/list_sort.h>
+#include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/spinlock.h>
-#include <linux/genalloc.h>
 
 #define SRAM_GRANULARITY        32
 
 struct sram_dev {
+        struct device *dev;
+        void __iomem *virt_base;
+
         struct gen_pool *pool;
         struct clk *clk;
 };
@@ -54,62 +51,27 @@ static int sram_reserve_cmp(void *priv, struct list_head *a,
         return ra->start - rb->start;
 }
 
-static int sram_probe(struct platform_device *pdev)
+static int sram_reserve_regions(struct sram_dev *sram, struct resource *res)
 {
-        void __iomem *virt_base;
-        struct sram_dev *sram;
-        struct resource *res;
-        struct device_node *np = pdev->dev.of_node, *child;
+        struct device_node *np = sram->dev->of_node, *child;
         unsigned long size, cur_start, cur_size;
         struct sram_reserve *rblocks, *block;
         struct list_head reserve_list;
         unsigned int nblocks;
-        int ret;
+        int ret = 0;
 
         INIT_LIST_HEAD(&reserve_list);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                dev_err(&pdev->dev, "found no memory resource\n");
-                return -EINVAL;
-        }
-
         size = resource_size(res);
 
-        if (!devm_request_mem_region(&pdev->dev,
-                        res->start, size, pdev->name)) {
-                dev_err(&pdev->dev, "could not request region for resource\n");
-                return -EBUSY;
-        }
-
-        virt_base = devm_ioremap_wc(&pdev->dev, res->start, size);
-        if (IS_ERR(virt_base))
-                return PTR_ERR(virt_base);
-
-        sram = devm_kzalloc(&pdev->dev, sizeof(*sram), GFP_KERNEL);
-        if (!sram)
-                return -ENOMEM;
-
-        sram->clk = devm_clk_get(&pdev->dev, NULL);
-        if (IS_ERR(sram->clk))
-                sram->clk = NULL;
-        else
-                clk_prepare_enable(sram->clk);
-
-        sram->pool = devm_gen_pool_create(&pdev->dev, ilog2(SRAM_GRANULARITY), -1);
-        if (!sram->pool)
-                return -ENOMEM;
-
         /*
          * We need an additional block to mark the end of the memory region
          * after the reserved blocks from the dt are processed.
          */
         nblocks = (np) ? of_get_available_child_count(np) + 1 : 1;
         rblocks = kmalloc((nblocks) * sizeof(*rblocks), GFP_KERNEL);
-        if (!rblocks) {
-                ret = -ENOMEM;
-                goto err_alloc;
-        }
+        if (!rblocks)
+                return -ENOMEM;
 
         block = &rblocks[0];
         for_each_available_child_of_node(np, child) {
@@ -117,17 +79,19 @@ static int sram_probe(struct platform_device *pdev)
 
                 ret = of_address_to_resource(child, 0, &child_res);
                 if (ret < 0) {
-                        dev_err(&pdev->dev,
+                        dev_err(sram->dev,
                                 "could not get address for node %s\n",
                                 child->full_name);
+                        of_node_put(child);
                         goto err_chunks;
                 }
 
                 if (child_res.start < res->start || child_res.end > res->end) {
-                        dev_err(&pdev->dev,
+                        dev_err(sram->dev,
                                 "reserved block %s outside the sram area\n",
                                 child->full_name);
                         ret = -EINVAL;
+                        of_node_put(child);
                         goto err_chunks;
                 }
 
@@ -135,9 +99,8 @@ static int sram_probe(struct platform_device *pdev)
                 block->size = resource_size(&child_res);
                 list_add_tail(&block->list, &reserve_list);
 
-                dev_dbg(&pdev->dev, "found reserved block 0x%x-0x%x\n",
-                        block->start,
-                        block->start + block->size);
+                dev_dbg(sram->dev, "found reserved block 0x%x-0x%x\n",
+                        block->start, block->start + block->size);
 
                 block++;
         }
@@ -154,7 +117,7 @@ static int sram_probe(struct platform_device *pdev)
         list_for_each_entry(block, &reserve_list, list) {
                 /* can only happen if sections overlap */
                 if (block->start < cur_start) {
-                        dev_err(&pdev->dev,
+                        dev_err(sram->dev,
                                 "block at 0x%x starts after current offset 0x%lx\n",
                                 block->start, cur_start);
                         ret = -EINVAL;
@@ -174,10 +137,11 @@ static int sram_probe(struct platform_device *pdev)
                  */
                 cur_size = block->start - cur_start;
 
-                dev_dbg(&pdev->dev, "adding chunk 0x%lx-0x%lx\n",
+                dev_dbg(sram->dev, "adding chunk 0x%lx-0x%lx\n",
                         cur_start, cur_start + cur_size);
+
                 ret = gen_pool_add_virt(sram->pool,
-                                (unsigned long)virt_base + cur_start,
+                                (unsigned long)sram->virt_base + cur_start,
                                 res->start + cur_start, cur_size, -1);
                 if (ret < 0)
                         goto err_chunks;
@@ -186,20 +150,63 @@ static int sram_probe(struct platform_device *pdev)
                 cur_start = block->start + block->size;
         }
 
+ err_chunks:
         kfree(rblocks);
 
+        return ret;
+}
+
+static int sram_probe(struct platform_device *pdev)
+{
+        struct sram_dev *sram;
+        struct resource *res;
+        size_t size;
+        int ret;
+
+        sram = devm_kzalloc(&pdev->dev, sizeof(*sram), GFP_KERNEL);
+        if (!sram)
+                return -ENOMEM;
+
+        sram->dev = &pdev->dev;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res) {
+                dev_err(sram->dev, "found no memory resource\n");
+                return -EINVAL;
+        }
+
+        size = resource_size(res);
+
+        if (!devm_request_mem_region(sram->dev, res->start, size, pdev->name)) {
+                dev_err(sram->dev, "could not request region for resource\n");
+                return -EBUSY;
+        }
+
+        sram->virt_base = devm_ioremap_wc(sram->dev, res->start, size);
+        if (IS_ERR(sram->virt_base))
+                return PTR_ERR(sram->virt_base);
+
+        sram->pool = devm_gen_pool_create(sram->dev,
+                                          ilog2(SRAM_GRANULARITY), -1);
+        if (!sram->pool)
+                return -ENOMEM;
+
+        ret = sram_reserve_regions(sram, res);
+        if (ret)
+                return ret;
+
+        sram->clk = devm_clk_get(sram->dev, NULL);
+        if (IS_ERR(sram->clk))
+                sram->clk = NULL;
+        else
+                clk_prepare_enable(sram->clk);
+
         platform_set_drvdata(pdev, sram);
 
-        dev_dbg(&pdev->dev, "SRAM pool: %ld KiB @ 0x%p\n", size / 1024, virt_base);
+        dev_dbg(sram->dev, "SRAM pool: %zu KiB @ 0x%p\n",
+                gen_pool_size(sram->pool) / 1024, sram->virt_base);
 
         return 0;
-
-err_chunks:
-        kfree(rblocks);
-err_alloc:
-        if (sram->clk)
-                clk_disable_unprepare(sram->clk);
-        return ret;
 }
 
 static int sram_remove(struct platform_device *pdev)
@@ -207,7 +214,7 @@ static int sram_remove(struct platform_device *pdev)
         struct sram_dev *sram = platform_get_drvdata(pdev);
 
         if (gen_pool_avail(sram->pool) < gen_pool_size(sram->pool))
-                dev_dbg(&pdev->dev, "removed while SRAM allocated\n");
+                dev_err(sram->dev, "removed while SRAM allocated\n");
 
         if (sram->clk)
                 clk_disable_unprepare(sram->clk);