crypto: omap - add omap_des_unregister_algs helper

Add a new helper omap_des_unregister_algs() and replace two for loops in
omap_des_probe() and omap_des_remove(), which also ensure ->registered
is reset to 0.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/omap-des.c b/drivers/crypto/omap-des.c
index 149ebd77710bf5ae84d394e09847e083ca9a892e..16d5c617d5ee8cc588947949ab457f3bc628d81b 100644 (file)
--- a/drivers/crypto/omap-des.c
+++ b/drivers/crypto/omap-des.c
@@ -938,6 +938,20 @@ static int omap_des_get_pdev(struct omap_des_dev *dd,
        return 0;
 }
 
+static void omap_des_unregister_algs(const struct omap_des_pdata *pdata)
+{
+       struct omap_des_algs_info *alg_info;
+       int i;
+
+       for (i = pdata->algs_info_size - 1; i >= 0; i--) {
+               alg_info = &pdata->algs_info[i];
+
+               crypto_engine_unregister_skciphers(alg_info->algs_list,
+                                                  alg_info->registered);
+               alg_info->registered = 0;
+       }
+}
+
 static int omap_des_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -1043,11 +1057,7 @@ static int omap_des_probe(struct platform_device *pdev)
        return 0;
 
 err_algs:
-       for (i = dd->pdata->algs_info_size - 1; i >= 0; i--)
-               for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--)
-                       crypto_engine_unregister_skcipher(
-                                       &dd->pdata->algs_info[i].algs_list[j]);
-
+       omap_des_unregister_algs(dd->pdata);
 err_engine:
        if (dd->engine)
                crypto_engine_exit(dd->engine);
@@ -1067,16 +1077,12 @@ err_data:
 static void omap_des_remove(struct platform_device *pdev)
 {
        struct omap_des_dev *dd = platform_get_drvdata(pdev);
-       int i, j;
 
        spin_lock_bh(&list_lock);
        list_del(&dd->list);
        spin_unlock_bh(&list_lock);
 
-       for (i = dd->pdata->algs_info_size - 1; i >= 0; i--)
-               for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--)
-                       crypto_engine_unregister_skcipher(
-                                       &dd->pdata->algs_info[i].algs_list[j]);
+       omap_des_unregister_algs(dd->pdata);
 
        cancel_work_sync(&dd->done_task);
        omap_des_dma_cleanup(dd);