OSDN Git Service

spi: orion: Use devm_clk_get()
authorJingoo Han <jg1.han@samsung.com>
Mon, 9 Dec 2013 10:21:22 +0000 (19:21 +0900)
committerMark Brown <broonie@linaro.org>
Mon, 9 Dec 2013 17:31:38 +0000 (17:31 +0000)
Use devm_clk_get() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/spi/spi-orion.c

index 744841e..7f2121f 100644 (file)
@@ -434,7 +434,7 @@ static int orion_spi_probe(struct platform_device *pdev)
        spi = spi_master_get_devdata(master);
        spi->master = master;
 
-       spi->clk = clk_get(&pdev->dev, NULL);
+       spi->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(spi->clk)) {
                status = PTR_ERR(spi->clk);
                goto out;
@@ -465,7 +465,6 @@ static int orion_spi_probe(struct platform_device *pdev)
 
 out_rel_clk:
        clk_disable_unprepare(spi->clk);
-       clk_put(spi->clk);
 out:
        spi_master_put(master);
        return status;
@@ -481,7 +480,6 @@ static int orion_spi_remove(struct platform_device *pdev)
        spi = spi_master_get_devdata(master);
 
        clk_disable_unprepare(spi->clk);
-       clk_put(spi->clk);
 
        return 0;
 }