| From 571da81201378c6fe16c0f73e6da32a0a6bf63c3 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Fri, 24 Jan 2014 09:44:01 +0100 |
| Subject: 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> |
| (cherry picked from commit 17fe0d9a28fe742c467f800625459cf7bcb44b3b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-rspi.c | 11 ++++++++--- |
| 1 file changed, 8 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c |
| index 28db8770aaf3..a648b40c271b 100644 |
| --- a/drivers/spi/spi-rspi.c |
| +++ b/drivers/spi/spi-rspi.c |
| @@ -980,7 +980,7 @@ static int rspi_remove(struct platform_device *pdev) |
| 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 @@ static int rspi_probe(struct platform_device *pdev) |
| 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 @@ static int rspi_probe(struct platform_device *pdev) |
| error3: |
| rspi_release_dma(rspi); |
| error2: |
| - clk_disable(rspi->clk); |
| + clk_disable_unprepare(rspi->clk); |
| error1: |
| spi_master_put(master); |
| |
| -- |
| 2.1.2 |
| |