spi: rspi: Convert to clk_prepare_enable/disable_unprepare
Get the driver ready for the migration to the common clock framework by
calling clk_prepare_enable() and clk_disable_unprepare().
Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 28db877..a648b40 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -980,7 +980,7 @@
struct rspi_data *rspi = platform_get_drvdata(pdev);
rspi_release_dma(rspi);
- clk_disable(rspi->clk);
+ clk_disable_unprepare(rspi->clk);
return 0;
}
@@ -1041,7 +1041,12 @@
ret = PTR_ERR(rspi->clk);
goto error1;
}
- clk_enable(rspi->clk);
+
+ ret = clk_prepare_enable(rspi->clk);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "unable to prepare/enable clock\n");
+ goto error1;
+ }
init_waitqueue_head(&rspi->wait);
@@ -1112,7 +1117,7 @@
error3:
rspi_release_dma(rspi);
error2:
- clk_disable(rspi->clk);
+ clk_disable_unprepare(rspi->clk);
error1:
spi_master_put(master);