lib/crc: Use consistent naming for CRC-32 polynomials

krzk · herbertx · commit e37f2f93afe5 · 2018-07-27T19:04:33.000+08:00
Header was defining CRCPOLY_LE/BE and CRC32C_POLY_LE but in fact all of
them are CRC-32 polynomials so use consistent naming.

Signed-off-by: Krzysztof Kozlowski &lt;krzk@kernel.org&gt;
Signed-off-by: Herbert Xu &lt;herbert@gondor.apana.org.au&gt;
diff --git a/include/linux/crc32poly.h b/include/linux/crc32poly.h
@@ -7,8 +7,8 @@
  * *the* standard CRC-32 polynomial, first popularized by Ethernet.
  * x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x^1+x^0
  */
-#define CRCPOLY_LE 0xedb88320
-#define CRCPOLY_BE 0x04c11db7
+#define CRC32_POLY_LE 0xedb88320
+#define CRC32_POLY_BE 0x04c11db7
 
 /*
  * This is the CRC32c polynomial, as outlined by Castagnoli.
diff --git a/lib/crc32.c b/lib/crc32.c
@@ -185,7 +185,7 @@ static inline u32 __pure crc32_le_generic(u32 crc, unsigned char const *p,
 #if CRC_LE_BITS == 1
 u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
-	return crc32_le_generic(crc, p, len, NULL, CRCPOLY_LE);
+	return crc32_le_generic(crc, p, len, NULL, CRC32_POLY_LE);
 }
 u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 {
@@ -195,7 +195,7 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)
 {
 	return crc32_le_generic(crc, p, len,
-			(const u32 (*)[256])crc32table_le, CRCPOLY_LE);
+			(const u32 (*)[256])crc32table_le, CRC32_POLY_LE);
 }
 u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)
 {
@@ -269,7 +269,7 @@ static u32 __attribute_const__ crc32_generic_shift(u32 crc, size_t len,
 
 u32 __attribute_const__ crc32_le_shift(u32 crc, size_t len)
 {
-	return crc32_generic_shift(crc, len, CRCPOLY_LE);
+	return crc32_generic_shift(crc, len, CRC32_POLY_LE);
 }
 
 u32 __attribute_const__ __crc32c_le_shift(u32 crc, size_t len)
@@ -331,13 +331,13 @@ static inline u32 __pure crc32_be_generic(u32 crc, unsigned char const *p,
 #if CRC_LE_BITS == 1
 u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
-	return crc32_be_generic(crc, p, len, NULL, CRCPOLY_BE);
+	return crc32_be_generic(crc, p, len, NULL, CRC32_POLY_BE);
 }
 #else
 u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)
 {
 	return crc32_be_generic(crc, p, len,
-			(const u32 (*)[256])crc32table_be, CRCPOLY_BE);
+			(const u32 (*)[256])crc32table_be, CRC32_POLY_BE);
 }
 #endif
 EXPORT_SYMBOL(crc32_be);
diff --git a/lib/gen_crc32table.c b/lib/gen_crc32table.c
@@ -58,7 +58,7 @@ static void crc32init_le_generic(const uint32_t polynomial,
 
 static void crc32init_le(void)
 {
-	crc32init_le_generic(CRCPOLY_LE, crc32table_le);
+	crc32init_le_generic(CRC32_POLY_LE, crc32table_le);
 }
 
 static void crc32cinit_le(void)
@@ -77,7 +77,7 @@ static void crc32init_be(void)
 	crc32table_be[0][0] = 0;
 
 	for (i = 1; i < BE_TABLE_SIZE; i <<= 1) {
-		crc = (crc << 1) ^ ((crc & 0x80000000) ? CRCPOLY_BE : 0);
+		crc = (crc << 1) ^ ((crc & 0x80000000) ? CRC32_POLY_BE : 0);
 		for (j = 0; j < i; j++)
 			crc32table_be[0][i + j] = crc ^ crc32table_be[0][j];
 	}

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ static inline u32 __pure crc32_le_generic(u32 crc, unsigned char const *p,`
`185`	`185`	`#if CRC_LE_BITS == 1`
`186`	`186`	`u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)`
`187`	`187`	`{`
`188`		`- return crc32_le_generic(crc, p, len, NULL, CRCPOLY_LE);`
	`188`	`+ return crc32_le_generic(crc, p, len, NULL, CRC32_POLY_LE);`
`189`	`189`	`}`
`190`	`190`	`u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)`
`191`	`191`	`{`
`@@ -195,7 +195,7 @@ u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)`
`195`	`195`	`u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len)`
`196`	`196`	`{`
`197`	`197`	`return crc32_le_generic(crc, p, len,`
`198`		`- (const u32 (*)[256])crc32table_le, CRCPOLY_LE);`
	`198`	`+ (const u32 (*)[256])crc32table_le, CRC32_POLY_LE);`
`199`	`199`	`}`
`200`	`200`	`u32 __pure __crc32c_le(u32 crc, unsigned char const *p, size_t len)`
`201`	`201`	`{`
`@@ -269,7 +269,7 @@ static u32 __attribute_const__ crc32_generic_shift(u32 crc, size_t len,`
`269`	`269`
`270`	`270`	`u32 __attribute_const__ crc32_le_shift(u32 crc, size_t len)`
`271`	`271`	`{`
`272`		`- return crc32_generic_shift(crc, len, CRCPOLY_LE);`
	`272`	`+ return crc32_generic_shift(crc, len, CRC32_POLY_LE);`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`u32 __attribute_const__ __crc32c_le_shift(u32 crc, size_t len)`
`@@ -331,13 +331,13 @@ static inline u32 __pure crc32_be_generic(u32 crc, unsigned char const *p,`
`331`	`331`	`#if CRC_LE_BITS == 1`
`332`	`332`	`u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)`
`333`	`333`	`{`
`334`		`- return crc32_be_generic(crc, p, len, NULL, CRCPOLY_BE);`
	`334`	`+ return crc32_be_generic(crc, p, len, NULL, CRC32_POLY_BE);`
`335`	`335`	`}`
`336`	`336`	`#else`
`337`	`337`	`u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len)`
`338`	`338`	`{`
`339`	`339`	`return crc32_be_generic(crc, p, len,`
`340`		`- (const u32 (*)[256])crc32table_be, CRCPOLY_BE);`
	`340`	`+ (const u32 (*)[256])crc32table_be, CRC32_POLY_BE);`
`341`	`341`	`}`
`342`	`342`	`#endif`
`343`	`343`	`EXPORT_SYMBOL(crc32_be);`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ static void crc32init_le_generic(const uint32_t polynomial,`
`58`	`58`
`59`	`59`	`static void crc32init_le(void)`
`60`	`60`	`{`
`61`		`- crc32init_le_generic(CRCPOLY_LE, crc32table_le);`
	`61`	`+ crc32init_le_generic(CRC32_POLY_LE, crc32table_le);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static void crc32cinit_le(void)`
`@@ -77,7 +77,7 @@ static void crc32init_be(void)`
`77`	`77`	`crc32table_be[0][0] = 0;`
`78`	`78`
`79`	`79`	`for (i = 1; i < BE_TABLE_SIZE; i <<= 1) {`
`80`		`- crc = (crc << 1) ^ ((crc & 0x80000000) ? CRCPOLY_BE : 0);`
	`80`	`+ crc = (crc << 1) ^ ((crc & 0x80000000) ? CRC32_POLY_BE : 0);`
`81`	`81`	`for (j = 0; j < i; j++)`
`82`	`82`	`crc32table_be[0][i + j] = crc ^ crc32table_be[0][j];`
`83`	`83`	`}`