aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2016-08-18 13:34:25 -0400
committerMark Brown <broonie@kernel.org>2016-08-18 14:10:39 -0400
commit1ae4ec1415a98328b693db588f30d02bb3ca73aa (patch)
tree0d8015d019cecfebd54b815d559b370ed20f4061 /drivers/spi
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (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')
-rw-r--r--drivers/spi/spi-txx9.c6
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)
346 c->clk = NULL; 346 c->clk = NULL;
347 goto exit; 347 goto exit;
348 } 348 }
349 ret = clk_enable(c->clk); 349 ret = clk_prepare_enable(c->clk);
350 if (ret) { 350 if (ret) {
351 c->clk = NULL; 351 c->clk = NULL;
352 goto exit; 352 goto exit;
@@ -395,7 +395,7 @@ static int txx9spi_probe(struct platform_device *dev)
395exit_busy: 395exit_busy:
396 ret = -EBUSY; 396 ret = -EBUSY;
397exit: 397exit:
398 clk_disable(c->clk); 398 clk_disable_unprepare(c->clk);
399 spi_master_put(master); 399 spi_master_put(master);
400 return ret; 400 return ret;
401} 401}
@@ -406,7 +406,7 @@ static int txx9spi_remove(struct platform_device *dev)
406 struct txx9spi *c = spi_master_get_devdata(master); 406 struct txx9spi *c = spi_master_get_devdata(master);
407 407
408 flush_work(&c->work); 408 flush_work(&c->work);
409 clk_disable(c->clk); 409 clk_disable_unprepare(c->clk);
410 return 0; 410 return 0;
411} 411}
412 412