Skip to content

Commit 68ea3c2

Browse files
ebiggersebiggers
committed
lib/crc32: remove "_le" from crc32c base and arch functions
Following the standardization on crc32c() as the lib entry point for the Castagnoli CRC32 instead of the previous mix of crc32c(), crc32c_le(), and __crc32c_le(), make the same change to the underlying base and arch functions that implement it. Reviewed-by: Ard Biesheuvel <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Eric Biggers <[email protected]>
1 parent c64e657 commit 68ea3c2

File tree

12 files changed

+40
-40
lines changed

12 files changed

+40
-40
lines changed

‎arch/arm/lib/crc32-glue.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ u32 crc32_le_arch(u32 crc, const u8 *p, size_t len)
5959
}
6060
EXPORT_SYMBOL(crc32_le_arch);
6161

62-
static u32 crc32c_le_scalar(u32 crc, const u8 *p, size_t len)
62+
static u32 crc32c_scalar(u32 crc, const u8 *p, size_t len)
6363
{
6464
if (static_branch_likely(&have_crc32))
6565
return crc32c_armv8_le(crc, p, len);
66-
return crc32c_le_base(crc, p, len);
66+
return crc32c_base(crc, p, len);
6767
}
6868

69-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
69+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
7070
{
7171
if (len >= PMULL_MIN_LEN + 15 &&
7272
static_branch_likely(&have_pmull) && crypto_simd_usable()) {
7373
size_t n = -(uintptr_t)p & 15;
7474

7575
/* align p to 16-byte boundary */
7676
if (n) {
77-
crc = crc32c_le_scalar(crc, p, n);
77+
crc = crc32c_scalar(crc, p, n);
7878
p += n;
7979
len -= n;
8080
}
@@ -85,9 +85,9 @@ u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
8585
p += n;
8686
len -= n;
8787
}
88-
return crc32c_le_scalar(crc, p, len);
88+
return crc32c_scalar(crc, p, len);
8989
}
90-
EXPORT_SYMBOL(crc32c_le_arch);
90+
EXPORT_SYMBOL(crc32c_arch);
9191

9292
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
9393
{

‎arch/arm64/lib/crc32-glue.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ u32 crc32_le_arch(u32 crc, const u8 *p, size_t len)
4343
}
4444
EXPORT_SYMBOL(crc32_le_arch);
4545

46-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
46+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
4747
{
4848
if (!alternative_has_cap_likely(ARM64_HAS_CRC32))
49-
return crc32c_le_base(crc, p, len);
49+
return crc32c_base(crc, p, len);
5050

5151
if (len >= min_len && cpu_have_named_feature(PMULL) && crypto_simd_usable()) {
5252
kernel_neon_begin();
@@ -62,7 +62,7 @@ u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
6262

6363
return crc32c_le_arm64(crc, p, len);
6464
}
65-
EXPORT_SYMBOL(crc32c_le_arch);
65+
EXPORT_SYMBOL(crc32c_arch);
6666

6767
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
6868
{

‎arch/loongarch/lib/crc32-loongarch.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ u32 crc32_le_arch(u32 crc, const u8 *p, size_t len)
6565
}
6666
EXPORT_SYMBOL(crc32_le_arch);
6767

68-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
68+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
6969
{
7070
if (!static_branch_likely(&have_crc32))
71-
return crc32c_le_base(crc, p, len);
71+
return crc32c_base(crc, p, len);
7272

7373
while (len >= sizeof(u64)) {
7474
u64 value = get_unaligned_le64(p);
@@ -100,7 +100,7 @@ u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
100100

101101
return crc;
102102
}
103-
EXPORT_SYMBOL(crc32c_le_arch);
103+
EXPORT_SYMBOL(crc32c_arch);
104104

105105
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
106106
{

‎arch/mips/lib/crc32-mips.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ u32 crc32_le_arch(u32 crc, const u8 *p, size_t len)
108108
}
109109
EXPORT_SYMBOL(crc32_le_arch);
110110

111-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
111+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
112112
{
113113
if (!static_branch_likely(&have_crc32))
114-
return crc32c_le_base(crc, p, len);
114+
return crc32c_base(crc, p, len);
115115

116116
if (IS_ENABLED(CONFIG_64BIT)) {
117117
for (; len >= sizeof(u64); p += sizeof(u64), len -= sizeof(u64)) {
@@ -149,7 +149,7 @@ u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
149149
}
150150
return crc;
151151
}
152-
EXPORT_SYMBOL(crc32c_le_arch);
152+
EXPORT_SYMBOL(crc32c_arch);
153153

154154
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
155155
{

‎arch/powerpc/lib/crc32-glue.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ u32 crc32_le_arch(u32 crc, const u8 *p, size_t len)
2323
}
2424
EXPORT_SYMBOL(crc32_le_arch);
2525

26-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
26+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
2727
{
2828
unsigned int prealign;
2929
unsigned int tail;
3030

3131
if (len < (VECTOR_BREAKPOINT + VMX_ALIGN) ||
3232
!static_branch_likely(&have_vec_crypto) || !crypto_simd_usable())
33-
return crc32c_le_base(crc, p, len);
33+
return crc32c_base(crc, p, len);
3434

3535
if ((unsigned long)p & VMX_ALIGN_MASK) {
3636
prealign = VMX_ALIGN - ((unsigned long)p & VMX_ALIGN_MASK);
37-
crc = crc32c_le_base(crc, p, prealign);
37+
crc = crc32c_base(crc, p, prealign);
3838
len -= prealign;
3939
p += prealign;
4040
}
@@ -52,12 +52,12 @@ u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
5252
tail = len & VMX_ALIGN_MASK;
5353
if (tail) {
5454
p += len & ~VMX_ALIGN_MASK;
55-
crc = crc32c_le_base(crc, p, tail);
55+
crc = crc32c_base(crc, p, tail);
5656
}
5757

5858
return crc;
5959
}
60-
EXPORT_SYMBOL(crc32c_le_arch);
60+
EXPORT_SYMBOL(crc32c_arch);
6161

6262
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
6363
{

‎arch/riscv/lib/crc32-riscv.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,12 +224,12 @@ u32 crc32_le_arch(u32 crc, const u8 *p, size_t len)
224224
}
225225
EXPORT_SYMBOL(crc32_le_arch);
226226

227-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
227+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
228228
{
229229
return crc32_le_generic(crc, p, len, CRC32C_POLY_LE,
230-
CRC32C_POLY_QT_LE, crc32c_le_base);
230+
CRC32C_POLY_QT_LE, crc32c_base);
231231
}
232-
EXPORT_SYMBOL(crc32c_le_arch);
232+
EXPORT_SYMBOL(crc32c_arch);
233233

234234
static inline u32 crc32_be_unaligned(u32 crc, unsigned char const *p,
235235
size_t len)

‎arch/s390/lib/crc32-glue.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static DEFINE_STATIC_KEY_FALSE(have_vxrs);
6262

6363
DEFINE_CRC32_VX(crc32_le_arch, crc32_le_vgfm_16, crc32_le_base)
6464
DEFINE_CRC32_VX(crc32_be_arch, crc32_be_vgfm_16, crc32_be_base)
65-
DEFINE_CRC32_VX(crc32c_le_arch, crc32c_le_vgfm_16, crc32c_le_base)
65+
DEFINE_CRC32_VX(crc32c_arch, crc32c_le_vgfm_16, crc32c_base)
6666

6767
static int __init crc32_s390_init(void)
6868
{

‎arch/sparc/lib/crc32_glue.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ EXPORT_SYMBOL(crc32_le_arch);
2727

2828
void crc32c_sparc64(u32 *crcp, const u64 *data, size_t len);
2929

30-
u32 crc32c_le_arch(u32 crc, const u8 *data, size_t len)
30+
u32 crc32c_arch(u32 crc, const u8 *data, size_t len)
3131
{
3232
size_t n = -(uintptr_t)data & 7;
3333

3434
if (!static_branch_likely(&have_crc32c_opcode))
35-
return crc32c_le_base(crc, data, len);
35+
return crc32c_base(crc, data, len);
3636

3737
if (n) {
3838
/* Data isn't 8-byte aligned. Align it. */
3939
n = min(n, len);
40-
crc = crc32c_le_base(crc, data, n);
40+
crc = crc32c_base(crc, data, n);
4141
data += n;
4242
len -= n;
4343
}
@@ -48,10 +48,10 @@ u32 crc32c_le_arch(u32 crc, const u8 *data, size_t len)
4848
len -= n;
4949
}
5050
if (len)
51-
crc = crc32c_le_base(crc, data, len);
51+
crc = crc32c_base(crc, data, len);
5252
return crc;
5353
}
54-
EXPORT_SYMBOL(crc32c_le_arch);
54+
EXPORT_SYMBOL(crc32c_arch);
5555

5656
u32 crc32_be_arch(u32 crc, const u8 *data, size_t len)
5757
{

‎arch/x86/lib/crc32-glue.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ EXPORT_SYMBOL(crc32_le_arch);
6161

6262
asmlinkage u32 crc32c_x86_3way(u32 crc, const u8 *buffer, size_t len);
6363

64-
u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
64+
u32 crc32c_arch(u32 crc, const u8 *p, size_t len)
6565
{
6666
size_t num_longs;
6767

6868
if (!static_branch_likely(&have_crc32))
69-
return crc32c_le_base(crc, p, len);
69+
return crc32c_base(crc, p, len);
7070

7171
if (IS_ENABLED(CONFIG_X86_64) && len >= CRC32C_PCLMUL_BREAKEVEN &&
7272
static_branch_likely(&have_pclmulqdq) && crypto_simd_usable()) {
@@ -85,7 +85,7 @@ u32 crc32c_le_arch(u32 crc, const u8 *p, size_t len)
8585

8686
return crc;
8787
}
88-
EXPORT_SYMBOL(crc32c_le_arch);
88+
EXPORT_SYMBOL(crc32c_arch);
8989

9090
u32 crc32_be_arch(u32 crc, const u8 *p, size_t len)
9191
{

‎crypto/crc32c_generic.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static int chksum_update(struct shash_desc *desc, const u8 *data,
8585
{
8686
struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
8787

88-
ctx->crc = crc32c_le_base(ctx->crc, data, length);
88+
ctx->crc = crc32c_base(ctx->crc, data, length);
8989
return 0;
9090
}
9191

@@ -108,7 +108,7 @@ static int chksum_final(struct shash_desc *desc, u8 *out)
108108

109109
static int __chksum_finup(u32 *crcp, const u8 *data, unsigned int len, u8 *out)
110110
{
111-
put_unaligned_le32(~crc32c_le_base(*crcp, data, len), out);
111+
put_unaligned_le32(~crc32c_base(*crcp, data, len), out);
112112
return 0;
113113
}
114114

0 commit comments

Comments
 (0)