2023-01-31 08:02:58

by Herbert Xu

Subject: [PATCH 17/32] crypto: ccp - Use request_complete helpers

Use the request_complete helpers instead of calling the completion
function directly.

Signed-off-by: Herbert Xu <[email protected]>
---

drivers/crypto/ccp/ccp-crypto-main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/ccp/ccp-crypto-main.c b/drivers/crypto/ccp/ccp-crypto-main.c
index 73442a382f68..ecd58b38c46e 100644
--- a/drivers/crypto/ccp/ccp-crypto-main.c
+++ b/drivers/crypto/ccp/ccp-crypto-main.c
@@ -146,7 +146,7 @@ static void ccp_crypto_complete(void *data, int err)
/* Only propagate the -EINPROGRESS if necessary */
if (crypto_cmd->ret == -EBUSY) {
crypto_cmd->ret = -EINPROGRESS;
- req->complete(req, -EINPROGRESS);
+ crypto_request_complete(req, -EINPROGRESS);
}

return;
@@ -159,18 +159,18 @@ static void ccp_crypto_complete(void *data, int err)
held = ccp_crypto_cmd_complete(crypto_cmd, &backlog);
if (backlog) {
backlog->ret = -EINPROGRESS;
- backlog->req->complete(backlog->req, -EINPROGRESS);
+ crypto_request_complete(backlog->req, -EINPROGRESS);
}

/* Transition the state from -EBUSY to -EINPROGRESS first */
if (crypto_cmd->ret == -EBUSY)
- req->complete(req, -EINPROGRESS);
+ crypto_request_complete(req, -EINPROGRESS);

/* Completion callbacks */
ret = err;
if (ctx->complete)
ret = ctx->complete(req, ret);
- req->complete(req, ret);
+ crypto_request_complete(req, ret);

/* Submit the next cmd */
while (held) {
@@ -186,12 +186,12 @@ static void ccp_crypto_complete(void *data, int err)
ctx = crypto_tfm_ctx_dma(held->req->tfm);
if (ctx->complete)
ret = ctx->complete(held->req, ret);
- held->req->complete(held->req, ret);
+ crypto_request_complete(held->req, ret);

next = ccp_crypto_cmd_complete(held, &backlog);
if (backlog) {
backlog->ret = -EINPROGRESS;
- backlog->req->complete(backlog->req, -EINPROGRESS);
+ crypto_request_complete(backlog->req, -EINPROGRESS);
}

kfree(held);

2023-01-31 15:23:22

by Tom Lendacky

Subject: Re: [PATCH 17/32] crypto: ccp - Use request_complete helpers

On 1/31/23 02:02, Herbert Xu wrote:
> Use the request_complete helpers instead of calling the completion
> function directly.
>
> Signed-off-by: Herbert Xu <[email protected]>

Acked-by: Tom Lendacky <[email protected]>

> ---
>
> drivers/crypto/ccp/ccp-crypto-main.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/crypto/ccp/ccp-crypto-main.c b/drivers/crypto/ccp/ccp-crypto-main.c
> index 73442a382f68..ecd58b38c46e 100644
> --- a/drivers/crypto/ccp/ccp-crypto-main.c
> +++ b/drivers/crypto/ccp/ccp-crypto-main.c
> @@ -146,7 +146,7 @@ static void ccp_crypto_complete(void *data, int err)
> /* Only propagate the -EINPROGRESS if necessary */
> if (crypto_cmd->ret == -EBUSY) {
> crypto_cmd->ret = -EINPROGRESS;
> - req->complete(req, -EINPROGRESS);
> + crypto_request_complete(req, -EINPROGRESS);
> }
>
> return;
> @@ -159,18 +159,18 @@ static void ccp_crypto_complete(void *data, int err)
> held = ccp_crypto_cmd_complete(crypto_cmd, &backlog);
> if (backlog) {
> backlog->ret = -EINPROGRESS;
> - backlog->req->complete(backlog->req, -EINPROGRESS);
> + crypto_request_complete(backlog->req, -EINPROGRESS);
> }
>
> /* Transition the state from -EBUSY to -EINPROGRESS first */
> if (crypto_cmd->ret == -EBUSY)
> - req->complete(req, -EINPROGRESS);
> + crypto_request_complete(req, -EINPROGRESS);
>
> /* Completion callbacks */
> ret = err;
> if (ctx->complete)
> ret = ctx->complete(req, ret);
> - req->complete(req, ret);
> + crypto_request_complete(req, ret);
>
> /* Submit the next cmd */
> while (held) {
> @@ -186,12 +186,12 @@ static void ccp_crypto_complete(void *data, int err)
> ctx = crypto_tfm_ctx_dma(held->req->tfm);
> if (ctx->complete)
> ret = ctx->complete(held->req, ret);
> - held->req->complete(held->req, ret);
> + crypto_request_complete(held->req, ret);
>
> next = ccp_crypto_cmd_complete(held, &backlog);
> if (backlog) {
> backlog->ret = -EINPROGRESS;
> - backlog->req->complete(backlog->req, -EINPROGRESS);
> + crypto_request_complete(backlog->req, -EINPROGRESS);
> }
>
> kfree(held);