lib/crc32: rename __crc32c_le_combine() to crc32c_combine()

Since the Castagnoli CRC32 is now always just crc32c(), rename
__crc32c_le_combine() and __crc32c_le_shift() accordingly.

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250208024911.14936-6-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>

diff --git a/drivers/infiniband/sw/siw/siw.h b/drivers/infiniband/sw/siw/siw.h
index ea5eee50dc39d05886a99f8af2bd4189e0dab485..4e692de1da933186e5b821177c510f49fbf9a1ed 100644 (file)
--- a/drivers/infiniband/sw/siw/siw.h
+++ b/drivers/infiniband/sw/siw/siw.h
@@ -676,8 +676,8 @@ static inline __wsum siw_csum_update(const void *buff, int len, __wsum sum)
 static inline __wsum siw_csum_combine(__wsum csum, __wsum csum2, int offset,
                                      int len)
 {
-       return (__force __wsum)__crc32c_le_combine((__force __u32)csum,
-                                                  (__force __u32)csum2, len);
+       return (__force __wsum)crc32c_combine((__force __u32)csum,
+                                             (__force __u32)csum2, len);
 }
 
 static inline void siw_crc_skb(struct siw_rx_stream *srx, unsigned int len)

diff --git a/include/linux/crc32.h b/include/linux/crc32.h
index bc39b023eac0f9c419ed913322bf900237866950..535071964f52fdb0f5781c5af298952109e36634 100644 (file)
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
@@ -76,29 +76,27 @@ static inline u32 crc32_le_combine(u32 crc1, u32 crc2, size_t len2)
        return crc32_le_shift(crc1, len2) ^ crc2;
 }
 
+u32 crc32c_shift(u32 crc, size_t len);
+
 /**
- * __crc32c_le_combine - Combine two crc32c check values into one. For two
- *                      sequences of bytes, seq1 and seq2 with lengths len1
- *                      and len2, __crc32c_le() check values were calculated
- *                      for each, crc1 and crc2.
+ * crc32c_combine - Combine two crc32c check values into one. For two sequences
+ *                 of bytes, seq1 and seq2 with lengths len1 and len2, crc32c()
+ *                 check values were calculated for each, crc1 and crc2.
  *
  * @crc1: crc32c of the first block
  * @crc2: crc32c of the second block
  * @len2: length of the second block
  *
- * Return: The __crc32c_le() check value of seq1 and seq2 concatenated,
- *        requiring only crc1, crc2, and len2. Note: If seq_full denotes
- *        the concatenated memory area of seq1 with seq2, and crc_full
- *        the __crc32c_le() value of seq_full, then crc_full ==
- *        __crc32c_le_combine(crc1, crc2, len2) when crc_full was
- *        seeded with the same initializer as crc1, and crc2 seed
- *        was 0. See also crc32c_combine_test().
+ * Return: The crc32c() check value of seq1 and seq2 concatenated, requiring
+ *        only crc1, crc2, and len2. Note: If seq_full denotes the concatenated
+ *        memory area of seq1 with seq2, and crc_full the crc32c() value of
+ *        seq_full, then crc_full == crc32c_combine(crc1, crc2, len2) when
+ *        crc_full was seeded with the same initializer as crc1, and crc2 seed
+ *        was 0. See also crc_combine_test().
  */
-u32 __crc32c_le_shift(u32 crc, size_t len);
-
-static inline u32 __crc32c_le_combine(u32 crc1, u32 crc2, size_t len2)
+static inline u32 crc32c_combine(u32 crc1, u32 crc2, size_t len2)
 {
-       return __crc32c_le_shift(crc1, len2) ^ crc2;
+       return crc32c_shift(crc1, len2) ^ crc2;
 }
 
 #define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)(data), length)

diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
index 93041c970753ed27b90e26581be888797cfbf0a5..291465c2581024faa1dc701f3050a6b3749e4676 100644 (file)
--- a/include/net/sctp/checksum.h
+++ b/include/net/sctp/checksum.h
@@ -36,8 +36,8 @@ static inline __wsum sctp_csum_update(const void *buff, int len, __wsum sum)
 static inline __wsum sctp_csum_combine(__wsum csum, __wsum csum2,
                                       int offset, int len)
 {
-       return (__force __wsum)__crc32c_le_combine((__force __u32)csum,
-                                                  (__force __u32)csum2, len);
+       return (__force __wsum)crc32c_combine((__force __u32)csum,
+                                             (__force __u32)csum2, len);
 }
 
 static const struct skb_checksum_ops sctp_csum_ops = {

diff --git a/lib/crc32.c b/lib/crc32.c
index 3c080cda5e1c950319c71ad75d84f6caff233352..554ef6827b80d7246a38b62214ebf367128b76d3 100644 (file)
--- a/lib/crc32.c
+++ b/lib/crc32.c
@@ -117,13 +117,13 @@ u32 crc32_le_shift(u32 crc, size_t len)
 {
        return crc32_generic_shift(crc, len, CRC32_POLY_LE);
 }
+EXPORT_SYMBOL(crc32_le_shift);
 
-u32 __crc32c_le_shift(u32 crc, size_t len)
+u32 crc32c_shift(u32 crc, size_t len)
 {
        return crc32_generic_shift(crc, len, CRC32C_POLY_LE);
 }
-EXPORT_SYMBOL(crc32_le_shift);
-EXPORT_SYMBOL(__crc32c_le_shift);
+EXPORT_SYMBOL(crc32c_shift);
 
 u32 crc32_be_base(u32 crc, const u8 *p, size_t len)
 {

diff --git a/lib/crc_kunit.c b/lib/crc_kunit.c
index 1e82fcf9489efa8fc136f3149083bb7d0eb8d08c..40b4b41f218474d5ae3c1dfd178242bc28e60c1e 100644 (file)
--- a/lib/crc_kunit.c
+++ b/lib/crc_kunit.c
@@ -363,7 +363,7 @@ static u64 crc32c_wrapper(u64 crc, const u8 *p, size_t len)
 
 static u64 crc32c_combine_wrapper(u64 crc1, u64 crc2, size_t len2)
 {
-       return __crc32c_le_combine(crc1, crc2, len2);
+       return crc32c_combine(crc1, crc2, len2);
 }
 
 static const struct crc_variant crc_variant_crc32c = {