summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorRichard Schmitt <richard.schmitt@freescale.com>2014-11-23 22:20:08 (GMT)
committerMatthew Weigel <Matthew.Weigel@freescale.com>2014-12-11 18:41:10 (GMT)
commit618cef17a3ebd69fca806ca0fb017276136a509b (patch)
treeebfe97531e7efd31e90f6bfca20cb09226b787ee /crypto
parent7e8ada355def8f4a59d63184767dafd1b1330f73 (diff)
downloadlinux-fsl-qoriq-618cef17a3ebd69fca806ca0fb017276136a509b.tar.xz
Revert "crypto: testmgr - remove unused function argument"
This reverts commit 30bd01a853781c4a6884b5107ce9e190ede21ade. Change-Id: Id669770c1787ec45e2c9ae4278b60ad3392e240d Reviewed-on: http://git.am.freescale.net:8181/24188 Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com> Tested-by: Richard Schmitt <richard.schmitt@freescale.com>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/testmgr.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index abc51a4..2f5902f 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -179,7 +179,9 @@ static void testmgr_free_buf(char *buf[XBUFSIZE])
free_page((unsigned long)buf[i]);
}
-static int wait_async_op(struct tcrypt_result *tr, int ret)
+static int do_one_async_hash_op(struct ahash_request *req,
+ struct tcrypt_result *tr,
+ int ret)
{
if (ret == -EINPROGRESS || ret == -EBUSY) {
ret = wait_for_completion_interruptible(&tr->completion);
@@ -263,26 +265,30 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
ahash_request_set_crypt(req, sg, result, template[i].psize);
if (use_digest) {
- ret = wait_async_op(&tresult, crypto_ahash_digest(req));
+ ret = do_one_async_hash_op(req, &tresult,
+ crypto_ahash_digest(req));
if (ret) {
pr_err("alg: hash: digest failed on test %d "
"for %s: ret=%d\n", j, algo, -ret);
goto out;
}
} else {
- ret = wait_async_op(&tresult, crypto_ahash_init(req));
+ ret = do_one_async_hash_op(req, &tresult,
+ crypto_ahash_init(req));
if (ret) {
pr_err("alt: hash: init failed on test %d "
"for %s: ret=%d\n", j, algo, -ret);
goto out;
}
- ret = wait_async_op(&tresult, crypto_ahash_update(req));
+ ret = do_one_async_hash_op(req, &tresult,
+ crypto_ahash_update(req));
if (ret) {
pr_err("alt: hash: update failed on test %d "
"for %s: ret=%d\n", j, algo, -ret);
goto out;
}
- ret = wait_async_op(&tresult, crypto_ahash_final(req));
+ ret = do_one_async_hash_op(req, &tresult,
+ crypto_ahash_final(req));
if (ret) {
pr_err("alt: hash: final failed on test %d "
"for %s: ret=%d\n", j, algo, -ret);