diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-12-25 21:48:33 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2013-02-05 07:43:00 -0500 |
| commit | e5118cd2c2881db18a92eec68d1b29db9bcbcaf3 (patch) | |
| tree | f117dac01db93b9371d8c2485706cb18c34aba86 /drivers/spi | |
| parent | f305a0a8d7fcd1a600bd0b727cd8137ed223f721 (diff) | |
spi/sirf: use clk_prepare_enable and clk_disable_unprepare
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-sirf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c index 750666751efd..1f04979492aa 100644 --- a/drivers/spi/spi-sirf.c +++ b/drivers/spi/spi-sirf.c | |||
| @@ -569,7 +569,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) | |||
| 569 | ret = -EINVAL; | 569 | ret = -EINVAL; |
| 570 | goto free_pin; | 570 | goto free_pin; |
| 571 | } | 571 | } |
| 572 | clk_enable(sspi->clk); | 572 | clk_prepare_enable(sspi->clk); |
| 573 | sspi->ctrl_freq = clk_get_rate(sspi->clk); | 573 | sspi->ctrl_freq = clk_get_rate(sspi->clk); |
| 574 | 574 | ||
| 575 | init_completion(&sspi->done); | 575 | init_completion(&sspi->done); |
| @@ -593,7 +593,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev) | |||
| 593 | return 0; | 593 | return 0; |
| 594 | 594 | ||
| 595 | free_clk: | 595 | free_clk: |
| 596 | clk_disable(sspi->clk); | 596 | clk_disable_unprepare(sspi->clk); |
| 597 | clk_put(sspi->clk); | 597 | clk_put(sspi->clk); |
| 598 | free_pin: | 598 | free_pin: |
| 599 | pinctrl_put(sspi->p); | 599 | pinctrl_put(sspi->p); |
| @@ -617,7 +617,7 @@ static int spi_sirfsoc_remove(struct platform_device *pdev) | |||
| 617 | if (sspi->chipselect[i] > 0) | 617 | if (sspi->chipselect[i] > 0) |
| 618 | gpio_free(sspi->chipselect[i]); | 618 | gpio_free(sspi->chipselect[i]); |
| 619 | } | 619 | } |
| 620 | clk_disable(sspi->clk); | 620 | clk_disable_unprepare(sspi->clk); |
| 621 | clk_put(sspi->clk); | 621 | clk_put(sspi->clk); |
| 622 | pinctrl_put(sspi->p); | 622 | pinctrl_put(sspi->p); |
| 623 | spi_master_put(master); | 623 | spi_master_put(master); |