Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / spi / spi-orion.c

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 744841e..7f2121f 100644 (file)
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -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;
 }