diff options
| author | Cristian Stoica <cristian.stoica@freescale.com> | 2014-09-18 11:49:49 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:41:32 (GMT) |
| commit | e76ebb4756e40345b5a1e077fc1e109e16e9c1ae (patch) | |
| tree | fc911a04b96ef6eb97eb91b28a228fffaa9cfd21 /drivers/crypto | |
| parent | 6cb169c377e76febedf12c048380c43d11e789c7 (diff) | |
| download | linux-fsl-qoriq-e76ebb4756e40345b5a1e077fc1e109e16e9c1ae.tar.xz | |
crypto: caam: remove dead code
- 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>
Change-Id: Iccd420733cac736e92c1f9b0cb8fb83fd39b40e4
Reviewed-on: http://git.am.freescale.net:8181/19799
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Richard Schmitt <richard.schmitt@freescale.com>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/caamalg.c | 14 | ||||
| -rw-r--r-- | drivers/crypto/caam/caamalg_qi.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c index 586791d..aea39a4 100644 --- a/drivers/crypto/caam/caamalg.c +++ b/drivers/crypto/caam/caamalg.c @@ -2085,7 +2085,7 @@ static void init_ablkcipher_job(u32 *sh_desc, dma_addr_t ptr, in_options = 0; } else { 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; } append_seq_in_ptr(desc, src_dma, req->nbytes + ivsize, in_options); @@ -2223,10 +2223,10 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, if (!all_contig) { if (!is_gcm) { sg_to_sec4_sg(req->assoc, - (assoc_nents ? : 1), + assoc_nents, edesc->sec4_sg + 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, @@ -2235,17 +2235,17 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, if (is_gcm) { sg_to_sec4_sg(req->assoc, - (assoc_nents ? : 1), + assoc_nents, edesc->sec4_sg + sec4_sg_index, 0); - sec4_sg_index += assoc_nents ? : 1; + sec4_sg_index += assoc_nents; } sg_to_sec4_sg_last(req->src, - (src_nents ? : 1), + src_nents, edesc->sec4_sg + sec4_sg_index, 0); - sec4_sg_index += src_nents ? : 1; + sec4_sg_index += src_nents; } if (dst_nents) { sg_to_sec4_sg_last(req->dst, dst_nents, diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c index 9a1c31b..8ae129f 100644 --- a/drivers/crypto/caam/caamalg_qi.c +++ b/drivers/crypto/caam/caamalg_qi.c @@ -1185,15 +1185,15 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, fd_sgt[1].extension = 1; fd_sgt[1].addr = qm_sg_dma; - sg_to_qm_sg(req->assoc, (assoc_nents ? : 1), sg_table, 0); - qm_sg_index += assoc_nents ? : 1; + sg_to_qm_sg(req->assoc, assoc_nents, sg_table, 0); + qm_sg_index += assoc_nents; dma_to_qm_sg_one(sg_table + qm_sg_index, iv_dma, ivsize, 0); qm_sg_index += 1; - sg_to_qm_sg_last(req->src, (src_nents ? : 1), + sg_to_qm_sg_last(req->src, src_nents, sg_table + qm_sg_index, 0); - qm_sg_index += src_nents ? : 1; + qm_sg_index += src_nents; } else { fd_sgt[1].extension = 0; |