Commit d4c85f9b authored by Cristian Stoica's avatar Cristian Stoica Committed by Herbert Xu

crypto: testmgr - remove unused function argument

The argument "req" of do_one_async_hash_op is not used by the
function. This patch removes this argument and renames the
function to match more closely its purpose.
Signed-off-by: default avatarCristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ad61e042
...@@ -178,9 +178,7 @@ static void testmgr_free_buf(char *buf[XBUFSIZE]) ...@@ -178,9 +178,7 @@ static void testmgr_free_buf(char *buf[XBUFSIZE])
free_page((unsigned long)buf[i]); free_page((unsigned long)buf[i]);
} }
static int do_one_async_hash_op(struct ahash_request *req, static int wait_async_op(struct tcrypt_result *tr, int ret)
struct tcrypt_result *tr,
int ret)
{ {
if (ret == -EINPROGRESS || ret == -EBUSY) { if (ret == -EINPROGRESS || ret == -EBUSY) {
ret = wait_for_completion_interruptible(&tr->completion); ret = wait_for_completion_interruptible(&tr->completion);
...@@ -264,30 +262,26 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template, ...@@ -264,30 +262,26 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
ahash_request_set_crypt(req, sg, result, template[i].psize); ahash_request_set_crypt(req, sg, result, template[i].psize);
if (use_digest) { if (use_digest) {
ret = do_one_async_hash_op(req, &tresult, ret = wait_async_op(&tresult, crypto_ahash_digest(req));
crypto_ahash_digest(req));
if (ret) { if (ret) {
pr_err("alg: hash: digest failed on test %d " pr_err("alg: hash: digest failed on test %d "
"for %s: ret=%d\n", j, algo, -ret); "for %s: ret=%d\n", j, algo, -ret);
goto out; goto out;
} }
} else { } else {
ret = do_one_async_hash_op(req, &tresult, ret = wait_async_op(&tresult, crypto_ahash_init(req));
crypto_ahash_init(req));
if (ret) { if (ret) {
pr_err("alt: hash: init failed on test %d " pr_err("alt: hash: init failed on test %d "
"for %s: ret=%d\n", j, algo, -ret); "for %s: ret=%d\n", j, algo, -ret);
goto out; goto out;
} }
ret = do_one_async_hash_op(req, &tresult, ret = wait_async_op(&tresult, crypto_ahash_update(req));
crypto_ahash_update(req));
if (ret) { if (ret) {
pr_err("alt: hash: update failed on test %d " pr_err("alt: hash: update failed on test %d "
"for %s: ret=%d\n", j, algo, -ret); "for %s: ret=%d\n", j, algo, -ret);
goto out; goto out;
} }
ret = do_one_async_hash_op(req, &tresult, ret = wait_async_op(&tresult, crypto_ahash_final(req));
crypto_ahash_final(req));
if (ret) { if (ret) {
pr_err("alt: hash: final failed on test %d " pr_err("alt: hash: final failed on test %d "
"for %s: ret=%d\n", j, algo, -ret); "for %s: ret=%d\n", j, algo, -ret);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment