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

Signed-off-by: Qing Zhang <zhangq...@loongson.cn>
---
 drivers/spi/spi-coldfire-qspi.c | 4 ++--
 drivers/spi/spi-omap-uwire.c    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index f80e06c..8996115 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -387,7 +387,7 @@ static int mcfqspi_probe(struct platform_device *pdev)
                status = PTR_ERR(mcfqspi->clk);
                goto fail0;
        }
-       clk_enable(mcfqspi->clk);
+       clk_prepare_enable(mcfqspi->clk);
 
        master->bus_num = pdata->bus_num;
        master->num_chipselect = pdata->num_chipselect;
@@ -425,7 +425,7 @@ static int mcfqspi_probe(struct platform_device *pdev)
        pm_runtime_disable(&pdev->dev);
        mcfqspi_cs_teardown(mcfqspi);
 fail1:
-       clk_disable(mcfqspi->clk);
+       clk_disable_unprepare(mcfqspi->clk);
 fail0:
        spi_master_put(master);
 
diff --git a/drivers/spi/spi-omap-uwire.c b/drivers/spi/spi-omap-uwire.c
index ce8dbdb..71402f7 100644
--- a/drivers/spi/spi-omap-uwire.c
+++ b/drivers/spi/spi-omap-uwire.c
@@ -443,7 +443,7 @@ static void uwire_cleanup(struct spi_device *spi)
 static void uwire_off(struct uwire_spi *uwire)
 {
        uwire_write_reg(UWIRE_SR3, 0);
-       clk_disable(uwire->ck);
+       clk_disable_unprepare(uwire->ck);
        spi_master_put(uwire->bitbang.master);
 }
 
@@ -475,7 +475,7 @@ static int uwire_probe(struct platform_device *pdev)
                spi_master_put(master);
                return status;
        }
-       clk_enable(uwire->ck);
+       clk_prepare_enable(uwire->ck);
 
        if (cpu_is_omap7xx())
                uwire_idx_shift = 1;
-- 
2.1.0

Reply via email to