Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Ovidiu Panait and committed by
Herbert Xu
c1024581 cbc9f5bc

+27 -25
+27 -25
drivers/crypto/tegra/tegra-se-hash.c
··· 117 117 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 118 118 119 119 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 120 - rctx->fallback_req.base.flags = req->base.flags & 121 - CRYPTO_TFM_REQ_MAY_SLEEP; 120 + ahash_request_set_callback(&rctx->fallback_req, 121 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 122 + req->base.complete, req->base.data); 122 123 123 124 return crypto_ahash_init(&rctx->fallback_req); 124 125 } ··· 131 130 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 132 131 133 132 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 134 - rctx->fallback_req.base.flags = req->base.flags & 135 - CRYPTO_TFM_REQ_MAY_SLEEP; 136 - rctx->fallback_req.nbytes = req->nbytes; 137 - rctx->fallback_req.src = req->src; 133 + ahash_request_set_callback(&rctx->fallback_req, 134 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 135 + req->base.complete, req->base.data); 136 + ahash_request_set_crypt(&rctx->fallback_req, req->src, NULL, req->nbytes); 138 137 139 138 return crypto_ahash_update(&rctx->fallback_req); 140 139 } ··· 146 145 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 147 146 148 147 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 149 - rctx->fallback_req.base.flags = req->base.flags & 150 - CRYPTO_TFM_REQ_MAY_SLEEP; 151 - rctx->fallback_req.result = req->result; 148 + ahash_request_set_callback(&rctx->fallback_req, 149 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 150 + req->base.complete, req->base.data); 151 + ahash_request_set_crypt(&rctx->fallback_req, NULL, req->result, 0); 152 152 153 153 return crypto_ahash_final(&rctx->fallback_req); 154 154 } ··· 161 159 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 162 160 163 161 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 164 - rctx->fallback_req.base.flags = req->base.flags & 165 - CRYPTO_TFM_REQ_MAY_SLEEP; 166 - 167 - rctx->fallback_req.nbytes = req->nbytes; 168 - rctx->fallback_req.src = req->src; 169 - rctx->fallback_req.result = req->result; 162 + ahash_request_set_callback(&rctx->fallback_req, 163 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 164 + req->base.complete, req->base.data); 165 + ahash_request_set_crypt(&rctx->fallback_req, req->src, req->result, 166 + req->nbytes); 170 167 171 168 return crypto_ahash_finup(&rctx->fallback_req); 172 169 } ··· 177 176 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 178 177 179 178 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 180 - rctx->fallback_req.base.flags = req->base.flags & 181 - CRYPTO_TFM_REQ_MAY_SLEEP; 182 - 183 - rctx->fallback_req.nbytes = req->nbytes; 184 - rctx->fallback_req.src = req->src; 185 - rctx->fallback_req.result = req->result; 179 + ahash_request_set_callback(&rctx->fallback_req, 180 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 181 + req->base.complete, req->base.data); 182 + ahash_request_set_crypt(&rctx->fallback_req, req->src, req->result, 183 + req->nbytes); 186 184 187 185 return crypto_ahash_digest(&rctx->fallback_req); 188 186 } ··· 193 193 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 194 194 195 195 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 196 - rctx->fallback_req.base.flags = req->base.flags & 197 - CRYPTO_TFM_REQ_MAY_SLEEP; 196 + ahash_request_set_callback(&rctx->fallback_req, 197 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 198 + req->base.complete, req->base.data); 198 199 199 200 return crypto_ahash_import(&rctx->fallback_req, in); 200 201 } ··· 207 206 struct tegra_sha_ctx *ctx = crypto_ahash_ctx(tfm); 208 207 209 208 ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm); 210 - rctx->fallback_req.base.flags = req->base.flags & 211 - CRYPTO_TFM_REQ_MAY_SLEEP; 209 + ahash_request_set_callback(&rctx->fallback_req, 210 + req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP, 211 + req->base.complete, req->base.data); 212 212 213 213 return crypto_ahash_export(&rctx->fallback_req, out); 214 214 }