]> git.karo-electronics.de Git - linux-beck.git/commitdiff
crypto: s5p-sss - Use clk_prepare/clk_unprepare
authorNaveen Krishna Chatradhi <ch.naveen@samsung.com>
Thu, 8 May 2014 13:58:15 +0000 (21:58 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 8 May 2014 13:58:15 +0000 (21:58 +0800)
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>
drivers/crypto/s5p-sss.c

index 0ffc0429d16d1efdee51477d20491a729becdd4c..ea7d4788f3111fa0011520194434fe7294f4ec98 100644 (file)
@@ -645,7 +645,11 @@ static int s5p_aes_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       clk_enable(pdata->clk);
+       err = clk_prepare_enable(pdata->clk);
+       if (err < 0) {
+               dev_err(dev, "Enabling SSS clk failed, err %d\n", err);
+               return err;
+       }
 
        spin_lock_init(&pdata->lock);
 
@@ -706,7 +710,7 @@ static int s5p_aes_probe(struct platform_device *pdev)
        tasklet_kill(&pdata->tasklet);
 
  err_irq:
-       clk_disable(pdata->clk);
+       clk_disable_unprepare(pdata->clk);
 
        s5p_dev = NULL;
 
@@ -726,7 +730,7 @@ static int s5p_aes_remove(struct platform_device *pdev)
 
        tasklet_kill(&pdata->tasklet);
 
-       clk_disable(pdata->clk);
+       clk_disable_unprepare(pdata->clk);
 
        s5p_dev = NULL;