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

crypto: sa2ul - Use bitfield helpers

Use the FIELD_PREP() helper, instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Geert Uytterhoeven and committed by
Herbert Xu 5876b0cb 087e1d71

+10 -9
+10 -9
drivers/crypto/sa2ul.c
··· 8 8 * Vitaly Andrianov 9 9 * Tero Kristo 10 10 */ 11 + #include <linux/bitfield.h> 11 12 #include <linux/clk.h> 12 13 #include <linux/dma-mapping.h> 13 14 #include <linux/dmaengine.h> ··· 647 646 cmdl[upd_info->enc_offset.index] &= 648 647 ~SA_CMDL_SOP_BYPASS_LEN_MASK; 649 648 cmdl[upd_info->enc_offset.index] |= 650 - ((u32)req->enc_offset << 651 - __ffs(SA_CMDL_SOP_BYPASS_LEN_MASK)); 649 + FIELD_PREP(SA_CMDL_SOP_BYPASS_LEN_MASK, 650 + req->enc_offset); 652 651 653 652 if (likely(upd_info->flags & SA_CMDL_UPD_ENC_IV)) { 654 653 __be32 *data = (__be32 *)&cmdl[upd_info->enc_iv.index]; ··· 667 666 cmdl[upd_info->auth_offset.index] &= 668 667 ~SA_CMDL_SOP_BYPASS_LEN_MASK; 669 668 cmdl[upd_info->auth_offset.index] |= 670 - ((u32)req->auth_offset << 671 - __ffs(SA_CMDL_SOP_BYPASS_LEN_MASK)); 669 + FIELD_PREP(SA_CMDL_SOP_BYPASS_LEN_MASK, 670 + req->auth_offset); 672 671 if (upd_info->flags & SA_CMDL_UPD_AUTH_IV) { 673 672 sa_copy_iv((void *)&cmdl[upd_info->auth_iv.index], 674 673 req->auth_iv, ··· 690 689 u8 hash_size, u32 *swinfo) 691 690 { 692 691 swinfo[0] = sc_id; 693 - swinfo[0] |= (flags << __ffs(SA_SW0_FLAGS_MASK)); 692 + swinfo[0] |= FIELD_PREP(SA_SW0_FLAGS_MASK, flags); 694 693 if (likely(cmdl_present)) 695 - swinfo[0] |= ((cmdl_offset | SA_SW0_CMDL_PRESENT) << 696 - __ffs(SA_SW0_CMDL_INFO_MASK)); 697 - swinfo[0] |= (eng_id << __ffs(SA_SW0_ENG_ID_MASK)); 694 + swinfo[0] |= FIELD_PREP(SA_SW0_CMDL_INFO_MASK, 695 + cmdl_offset | SA_SW0_CMDL_PRESENT); 696 + swinfo[0] |= FIELD_PREP(SA_SW0_ENG_ID_MASK, eng_id); 698 697 699 698 swinfo[0] |= SA_SW0_DEST_INFO_PRESENT; 700 699 swinfo[1] = (u32)(sc_phys & 0xFFFFFFFFULL); 701 700 swinfo[2] = (u32)((sc_phys & 0xFFFFFFFF00000000ULL) >> 32); 702 - swinfo[2] |= (hash_size << __ffs(SA_SW2_EGRESS_LENGTH)); 701 + swinfo[2] |= FIELD_PREP(SA_SW2_EGRESS_LENGTH, hash_size); 703 702 } 704 703 705 704 /* Dump the security context */