renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

crypto: caam - remove dead code

Browse Source 
- assoc_nents and src_nents are never zero when all_contig is false
- iv_contig is zero on the else branch

Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com>
Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Cristian Stoica 2015-01-21 11:53:30 +02:00 committed by Herbert Xu
parent 3f80be0239
commit 35b82e5540
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/crypto/caam/caamalg.c
View File

@ -2532,7 +2532,7 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr,
in_options = 0; in_options = 0;
} else { } else {
src_dma = edesc->sec4_sg_dma; src_dma = edesc->sec4_sg_dma;
sec4_sg_index += (iv_contig ? 0 : 1) + edesc->src_nents; sec4_sg_index += edesc->src_nents + 1;
in_options = LDST_SGF; in_options = LDST_SGF;
} }
append_seq_in_ptr(desc, src_dma, req->nbytes + ivsize, in_options); append_seq_in_ptr(desc, src_dma, req->nbytes + ivsize, in_options);
@ -2714,10 +2714,10 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,
if (!all_contig) { if (!all_contig) {
if (!is_gcm) { if (!is_gcm) {
sg_to_sec4_sg(req->assoc, sg_to_sec4_sg(req->assoc,
(assoc_nents ? : 1), assoc_nents,
edesc->sec4_sg + edesc->sec4_sg +
sec4_sg_index, 0); sec4_sg_index, 0);
sec4_sg_index += assoc_nents ? : 1; sec4_sg_index += assoc_nents;
} }
dma_to_sec4_sg_one(edesc->sec4_sg + sec4_sg_index, dma_to_sec4_sg_one(edesc->sec4_sg + sec4_sg_index,
@ -2726,17 +2726,17 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,
if (is_gcm) { if (is_gcm) {
sg_to_sec4_sg(req->assoc, sg_to_sec4_sg(req->assoc,
(assoc_nents ? : 1), assoc_nents,
edesc->sec4_sg + edesc->sec4_sg +
sec4_sg_index, 0); sec4_sg_index, 0);
sec4_sg_index += assoc_nents ? : 1; sec4_sg_index += assoc_nents;
} }
sg_to_sec4_sg_last(req->src, sg_to_sec4_sg_last(req->src,
(src_nents ? : 1), src_nents,
edesc->sec4_sg + edesc->sec4_sg +
sec4_sg_index, 0); sec4_sg_index, 0);
sec4_sg_index += src_nents ? : 1; sec4_sg_index += src_nents;
} }
if (dst_nents) { if (dst_nents) {
sg_to_sec4_sg_last(req->dst, dst_nents, sg_to_sec4_sg_last(req->dst, dst_nents,