1 From d828fe6d765939e457e87d7f348adfe69cfd4175 Mon Sep 17 00:00:00 2001
2 From: notro <notro@tronnes.org>
3 Date: Sun, 6 Jul 2014 12:07:25 +0200
4 Subject: [PATCH 047/114] spi-bcm2708: Prepare for Common Clock Framework
7 As part of migrating to use the Common Clock Framework, replace clk_enable()
8 with clk_prepare_enable() and clk_disable() with clk_disable_unprepare().
9 This does not affect behaviour under the current clock implementation.
11 Also add a missing clk_disable_unprepare() in the probe error path.
13 Signed-off-by: Noralf Tronnes <notro@tronnes.org>
15 drivers/spi/spi-bcm2708.c | 5 +++--
16 1 file changed, 3 insertions(+), 2 deletions(-)
18 --- a/drivers/spi/spi-bcm2708.c
19 +++ b/drivers/spi/spi-bcm2708.c
20 @@ -545,7 +545,7 @@ static int bcm2708_spi_probe(struct plat
23 /* initialise the hardware */
25 + clk_prepare_enable(clk);
26 bcm2708_wr(bs, SPI_CS, SPI_CS_REN | SPI_CS_CLEAR_RX | SPI_CS_CLEAR_TX);
28 err = spi_register_master(master);
29 @@ -561,6 +561,7 @@ static int bcm2708_spi_probe(struct plat
32 free_irq(bs->irq, master);
33 + clk_disable_unprepare(bs->clk);
35 destroy_workqueue(bs->workq);
37 @@ -585,7 +586,7 @@ static int bcm2708_spi_remove(struct pla
39 flush_work(&bs->work);
41 - clk_disable(bs->clk);
42 + clk_disable_unprepare(bs->clk);
44 free_irq(bs->irq, master);