diff options
author | Naveen Krishna Chatradhi <ch.naveen@samsung.com> | 2014-05-08 09:58:15 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-05-08 09:58:15 -0400 |
commit | c1eb7ef2656b0bf176c0a699df4f8830fa09d9aa (patch) | |
tree | fe4b3d0f29e3b3a6b2bc37310a8e4ea1485ca2c8 | |
parent | 8f9702aad13892cc50560f29adfa313da584636b (diff) |
crypto: s5p-sss - Use clk_prepare/clk_unprepare
This patch set adds use of clk_prepare/clk_unprepare as
required by generic clock framework.
Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
CC: David S. Miller <davem@davemloft.net>
CC: <linux-samsung-soc@vger.kernel.org>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | drivers/crypto/s5p-sss.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c index 0ffc0429d16d..ea7d4788f311 100644 --- a/drivers/crypto/s5p-sss.c +++ b/drivers/crypto/s5p-sss.c | |||
@@ -645,7 +645,11 @@ static int s5p_aes_probe(struct platform_device *pdev) | |||
645 | return -ENOENT; | 645 | return -ENOENT; |
646 | } | 646 | } |
647 | 647 | ||
648 | clk_enable(pdata->clk); | 648 | err = clk_prepare_enable(pdata->clk); |
649 | if (err < 0) { | ||
650 | dev_err(dev, "Enabling SSS clk failed, err %d\n", err); | ||
651 | return err; | ||
652 | } | ||
649 | 653 | ||
650 | spin_lock_init(&pdata->lock); | 654 | spin_lock_init(&pdata->lock); |
651 | 655 | ||
@@ -706,7 +710,7 @@ static int s5p_aes_probe(struct platform_device *pdev) | |||
706 | tasklet_kill(&pdata->tasklet); | 710 | tasklet_kill(&pdata->tasklet); |
707 | 711 | ||
708 | err_irq: | 712 | err_irq: |
709 | clk_disable(pdata->clk); | 713 | clk_disable_unprepare(pdata->clk); |
710 | 714 | ||
711 | s5p_dev = NULL; | 715 | s5p_dev = NULL; |
712 | 716 | ||
@@ -726,7 +730,7 @@ static int s5p_aes_remove(struct platform_device *pdev) | |||
726 | 730 | ||
727 | tasklet_kill(&pdata->tasklet); | 731 | tasklet_kill(&pdata->tasklet); |
728 | 732 | ||
729 | clk_disable(pdata->clk); | 733 | clk_disable_unprepare(pdata->clk); |
730 | 734 | ||
731 | s5p_dev = NULL; | 735 | s5p_dev = NULL; |
732 | 736 | ||