diff options
| author | Geert Uytterhoeven | 2016-08-18 19:34:25 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-18 19:10:39 +0100 |
| commit | 1ae4ec1415a98328b693db588f30d02bb3ca73aa (patch) | |
| tree | 0d8015d019cecfebd54b815d559b370ed20f4061 /drivers/spi/spi-txx9.c | |
| parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) | |
spi: spi-txx9: Add missing clock (un)prepare calls for CCF
While the custom minimal TXx9 clock implementation doesn't need or use
clock (un)prepare calls (they are dummies if !CONFIG_HAVE_CLK_PREPARE),
they are mandatory when using the Common Clock Framework.
Hence add them, to prepare for the advent of CCF.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-txx9.c')
| -rw-r--r-- | drivers/spi/spi-txx9.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c index 7492ea346b43..51759d3fd45f 100644 --- a/drivers/spi/spi-txx9.c +++ b/drivers/spi/spi-txx9.c @@ -346,7 +346,7 @@ static int txx9spi_probe(struct platform_device *dev) c->clk = NULL; goto exit; } - ret = clk_enable(c->clk); + ret = clk_prepare_enable(c->clk); if (ret) { c->clk = NULL; goto exit; @@ -395,7 +395,7 @@ static int txx9spi_probe(struct platform_device *dev) exit_busy: ret = -EBUSY; exit: - clk_disable(c->clk); + clk_disable_unprepare(c->clk); spi_master_put(master); return ret; } @@ -406,7 +406,7 @@ static int txx9spi_remove(struct platform_device *dev) struct txx9spi *c = spi_master_get_devdata(master); flush_work(&c->work); - clk_disable(c->clk); + clk_disable_unprepare(c->clk); return 0; } |