crypto: tegra - use API helpers to setup fallback request

Rather than setting up the fallback request by hand, use
ahash_request_set_callback() and ahash_request_set_crypt() API helpers
to properly setup the new request.

Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/tegra/tegra-se-hash.c b/drivers/crypto/tegra/tegra-se-hash.c
index 42d007b7af45dca78c974f82a202114e344841b1..d09b4aaeecefec2c7cf375514608fc574ea1dcf1 100644 (file)
--- a/drivers/crypto/tegra/tegra-se-hash.c
+++ b/drivers/crypto/tegra/tegra-se-hash.c
@@ -117,8 +117,9 @@ static int tegra_sha_fallback_init(struct ahash_request *req)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
 
        return crypto_ahash_init(&rctx->fallback_req);
 }
@@ -130,10 +131,10 @@ static int tegra_sha_fallback_update(struct ahash_request *req)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.nbytes = req->nbytes;
-       rctx->fallback_req.src = req->src;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, req->src, NULL, req->nbytes);
 
        return crypto_ahash_update(&rctx->fallback_req);
 }
@@ -145,9 +146,10 @@ static int tegra_sha_fallback_final(struct ahash_request *req)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.result = req->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, NULL, req->result, 0);
 
        return crypto_ahash_final(&rctx->fallback_req);
 }
@@ -159,12 +161,11 @@ static int tegra_sha_fallback_finup(struct ahash_request *req)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-
-       rctx->fallback_req.nbytes = req->nbytes;
-       rctx->fallback_req.src = req->src;
-       rctx->fallback_req.result = req->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, req->src, req->result,
+                               req->nbytes);
 
        return crypto_ahash_finup(&rctx->fallback_req);
 }
@@ -176,12 +177,11 @@ static int tegra_sha_fallback_digest(struct ahash_request *req)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-
-       rctx->fallback_req.nbytes = req->nbytes;
-       rctx->fallback_req.src = req->src;
-       rctx->fallback_req.result = req->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, req->src, req->result,
+                               req->nbytes);
 
        return crypto_ahash_digest(&rctx->fallback_req);
 }
@@ -193,8 +193,9 @@ static int tegra_sha_fallback_import(struct ahash_request *req, const void *in)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
 
        return crypto_ahash_import(&rctx->fallback_req, in);
 }
@@ -206,8 +207,9 @@ static int tegra_sha_fallback_export(struct ahash_request *req, void *out)
        struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);
-       rctx->fallback_req.base.flags = req->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
 
        return crypto_ahash_export(&rctx->fallback_req, out);
 }