spi/s3c64xx: use clk_prepare_enable and clk_disable_unprepare

Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 1a81c90a4a71..06a5fe777434 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -516,7 +516,7 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
 
         /* Disable Clock */
         if (sdd->port_conf->clk_from_cmu) {
-                clk_disable(sdd->src_clk);
+                clk_disable_unprepare(sdd->src_clk);
         } else {
                 val = readl(regs + S3C64XX_SPI_CLK_CFG);
                 val &= ~S3C64XX_SPI_ENCLK_ENABLE;
@@ -564,7 +564,7 @@ static void s3c64xx_spi_config(struct s3c64xx_spi_driver_data *sdd)
                 /* There is half-multiplier before the SPI */
                 clk_set_rate(sdd->src_clk, sdd->cur_speed * 2);
                 /* Enable Clock */
-                clk_enable(sdd->src_clk);
+                clk_prepare_enable(sdd->src_clk);
         } else {
                 /* Configure Clock */
                 val = readl(regs + S3C64XX_SPI_CLK_CFG);
@@ -1302,7 +1302,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
                 goto err3;
         }
 
-        if (clk_enable(sdd->clk)) {
+        if (clk_prepare_enable(sdd->clk)) {
                 dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");
                 ret = -EBUSY;
                 goto err4;
@@ -1317,7 +1317,7 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
                 goto err5;
         }
 
-        if (clk_enable(sdd->src_clk)) {
+        if (clk_prepare_enable(sdd->src_clk)) {
                 dev_err(&pdev->dev, "Couldn't enable clock '%s'\n", clk_name);
                 ret = -EBUSY;
                 goto err6;
@@ -1361,11 +1361,11 @@ static int __init s3c64xx_spi_probe(struct platform_device *pdev)
 err8:
         free_irq(irq, sdd);
 err7:
-        clk_disable(sdd->src_clk);
+        clk_disable_unprepare(sdd->src_clk);
 err6:
         clk_put(sdd->src_clk);
 err5:
-        clk_disable(sdd->clk);
+        clk_disable_unprepare(sdd->clk);
 err4:
         clk_put(sdd->clk);
 err3:
@@ -1393,10 +1393,10 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
 
         free_irq(platform_get_irq(pdev, 0), sdd);
 
-        clk_disable(sdd->src_clk);
+        clk_disable_unprepare(sdd->src_clk);
         clk_put(sdd->src_clk);
 
-        clk_disable(sdd->clk);
+        clk_disable_unprepare(sdd->clk);
         clk_put(sdd->clk);
 
         if (!sdd->cntrlr_info->cfg_gpio && pdev->dev.of_node)
@@ -1417,8 +1417,8 @@ static int s3c64xx_spi_suspend(struct device *dev)
         spi_master_suspend(master);
 
         /* Disable the clock */
-        clk_disable(sdd->src_clk);
-        clk_disable(sdd->clk);
+        clk_disable_unprepare(sdd->src_clk);
+        clk_disable_unprepare(sdd->clk);
 
         if (!sdd->cntrlr_info->cfg_gpio && dev->of_node)
                 s3c64xx_spi_dt_gpio_free(sdd);
@@ -1440,8 +1440,8 @@ static int s3c64xx_spi_resume(struct device *dev)
                 sci->cfg_gpio();
 
         /* Enable the clock */
-        clk_enable(sdd->src_clk);
-        clk_enable(sdd->clk);
+        clk_prepare_enable(sdd->src_clk);
+        clk_prepare_enable(sdd->clk);
 
         s3c64xx_spi_hwinit(sdd, sdd->port_id);
 
@@ -1457,8 +1457,8 @@ static int s3c64xx_spi_runtime_suspend(struct device *dev)
         struct spi_master *master = dev_get_drvdata(dev);
         struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
-        clk_disable(sdd->clk);
-        clk_disable(sdd->src_clk);
+        clk_disable_unprepare(sdd->clk);
+        clk_disable_unprepare(sdd->src_clk);
 
         return 0;
 }
@@ -1468,8 +1468,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
         struct spi_master *master = dev_get_drvdata(dev);
         struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
 
-        clk_enable(sdd->src_clk);
-        clk_enable(sdd->clk);
+        clk_prepare_enable(sdd->src_clk);
+        clk_prepare_enable(sdd->clk);
 
         return 0;
 }