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

crypto: talitos - static code checker fixes

-change req_ctx->nbuf from u64 to unsigned int to silence checker
warnings; this is safe since nbuf value is <= HASH_MAX_BLOCK_SIZE
-remove unused value read from TALITOS_CCPSR; there is no requirement
to read upper 32b before reading lower 32b of a 64b register;
SEC RM mentions: "reads can always be done by byte, word, or dword"
-remove unused return value of sg_to_link_tbl()
-change "len" parameter of map_single_talitos_ptr() and
to_talitos_ptr_len() to unsigned int; later, cpu_to_be16 will __force
downcast the value to unsigned short without any checker warning

Signed-off-by: Horia Geanta <horia.geanta@freescale.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Horia Geant? and committed by
Herbert Xu
42e8b0d7 bde9079f

+5 -7
+5 -7
drivers/crypto/talitos.c
··· 63 63 ptr->eptr = upper_32_bits(dma_addr); 64 64 } 65 65 66 - static void to_talitos_ptr_len(struct talitos_ptr *ptr, unsigned short len, 66 + static void to_talitos_ptr_len(struct talitos_ptr *ptr, unsigned int len, 67 67 bool is_sec1) 68 68 { 69 69 if (is_sec1) { ··· 94 94 */ 95 95 static void map_single_talitos_ptr(struct device *dev, 96 96 struct talitos_ptr *ptr, 97 - unsigned short len, void *data, 97 + unsigned int len, void *data, 98 98 enum dma_data_direction dir) 99 99 { 100 100 dma_addr_t dma_addr = dma_map_single(dev, data, len, dir); ··· 543 543 struct talitos_private *priv = dev_get_drvdata(dev); 544 544 unsigned int timeout = TALITOS_TIMEOUT; 545 545 int ch, error, reset_dev = 0; 546 - u32 v, v_lo; 546 + u32 v_lo; 547 547 bool is_sec1 = has_ftr_sec1(priv); 548 548 int reset_ch = is_sec1 ? 1 : 0; /* only SEC2 supports continuation */ 549 549 ··· 560 560 561 561 error = -EINVAL; 562 562 563 - v = in_be32(priv->chan[ch].reg + TALITOS_CCPSR); 564 563 v_lo = in_be32(priv->chan[ch].reg + TALITOS_CCPSR_LO); 565 564 566 565 if (v_lo & TALITOS_CCPSR_LO_DOF) { ··· 814 815 unsigned int first; 815 816 unsigned int last; 816 817 unsigned int to_hash_later; 817 - u64 nbuf; 818 + unsigned int nbuf; 818 819 struct scatterlist bufsl[2]; 819 820 struct scatterlist *psrc; 820 821 }; ··· 1638 1639 (edesc->src_nents + 1) * 1639 1640 sizeof(struct talitos_ptr), 0); 1640 1641 ptr->j_extent |= DESC_PTR_LNKTBL_JUMP; 1641 - sg_count = sg_to_link_tbl(dst, sg_count, len, 1642 - link_tbl_ptr); 1642 + sg_to_link_tbl(dst, sg_count, len, link_tbl_ptr); 1643 1643 dma_sync_single_for_device(dev, edesc->dma_link_tbl, 1644 1644 edesc->dma_len, 1645 1645 DMA_BIDIRECTIONAL);