]> Pileus Git - ~andy/linux/commitdiff
spi: txx9: Use devm_clk_get()
authorJingoo Han <jg1.han@samsung.com>
Mon, 9 Dec 2013 10:23:12 +0000 (19:23 +0900)
committerMark Brown <broonie@linaro.org>
Tue, 17 Dec 2013 22:56:24 +0000 (22:56 +0000)
Use devm_clk_get() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-txx9.c

index 637cce2b8bdde8d3f37c8134a5f3aee7c4adead8..b206de1616d5b2b83e7553c9982a93cbe3705bc6 100644 (file)
@@ -348,7 +348,7 @@ static int txx9spi_probe(struct platform_device *dev)
        INIT_LIST_HEAD(&c->queue);
        init_waitqueue_head(&c->waitq);
 
-       c->clk = clk_get(&dev->dev, "spi-baseclk");
+       c->clk = devm_clk_get(&dev->dev, "spi-baseclk");
        if (IS_ERR(c->clk)) {
                ret = PTR_ERR(c->clk);
                c->clk = NULL;
@@ -415,10 +415,8 @@ exit_busy:
 exit:
        if (c->workqueue)
                destroy_workqueue(c->workqueue);
-       if (c->clk) {
+       if (c->clk)
                clk_disable(c->clk);
-               clk_put(c->clk);
-       }
        spi_master_put(master);
        return ret;
 }
@@ -430,7 +428,6 @@ static int txx9spi_remove(struct platform_device *dev)
 
        destroy_workqueue(c->workqueue);
        clk_disable(c->clk);
-       clk_put(c->clk);
        return 0;
 }