Skip to content

Commit

Permalink
spi: rspi: Convert to clk_prepare_enable/disable_unprepare
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Mark Brown committed Jan 27, 2014
1 parent 06a7a3c commit 17fe0d9
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions drivers/spi/spi-rspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 17fe0d9

Please sign in to comment.