OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Geert Uytterhoeven 2014-01-24 09:44:01 +01:00 committed by Mark Brown
parent 06a7a3cff0
commit 17fe0d9a28
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/spi/spi-rspi.c
View File

@ -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);