From: Eric Biggers <ebiggers@xxxxxxxxxx> Since neither crc7_be_syndrome_table nor crc7_be_byte() are used outside lib/crc7.c, fold them into lib/crc7.c. Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> --- include/linux/crc7.h | 7 ------- lib/crc7.c | 6 ++---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/linux/crc7.h b/include/linux/crc7.h index b462842f3c32c..61d34749e437d 100644 --- a/include/linux/crc7.h +++ b/include/linux/crc7.h @@ -1,15 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef _LINUX_CRC7_H #define _LINUX_CRC7_H #include <linux/types.h> -extern const u8 crc7_be_syndrome_table[256]; - -static inline u8 crc7_be_byte(u8 crc, u8 data) -{ - return crc7_be_syndrome_table[crc ^ data]; -} - extern u8 crc7_be(u8 crc, const u8 *buffer, size_t len); #endif diff --git a/lib/crc7.c b/lib/crc7.c index 3848e313b7224..8dd991cc61146 100644 --- a/lib/crc7.c +++ b/lib/crc7.c @@ -5,18 +5,17 @@ #include <linux/types.h> #include <linux/module.h> #include <linux/crc7.h> - /* * Table for CRC-7 (polynomial x^7 + x^3 + 1). * This is a big-endian CRC (msbit is highest power of x), * aligned so the msbit of the byte is the x^6 coefficient * and the lsbit is not used. */ -const u8 crc7_be_syndrome_table[256] = { +static const u8 crc7_be_syndrome_table[256] = { 0x00, 0x12, 0x24, 0x36, 0x48, 0x5a, 0x6c, 0x7e, 0x90, 0x82, 0xb4, 0xa6, 0xd8, 0xca, 0xfc, 0xee, 0x32, 0x20, 0x16, 0x04, 0x7a, 0x68, 0x5e, 0x4c, 0xa2, 0xb0, 0x86, 0x94, 0xea, 0xf8, 0xce, 0xdc, 0x64, 0x76, 0x40, 0x52, 0x2c, 0x3e, 0x08, 0x1a, @@ -46,11 +45,10 @@ const u8 crc7_be_syndrome_table[256] = { 0x2e, 0x3c, 0x0a, 0x18, 0x66, 0x74, 0x42, 0x50, 0xbe, 0xac, 0x9a, 0x88, 0xf6, 0xe4, 0xd2, 0xc0, 0x1c, 0x0e, 0x38, 0x2a, 0x54, 0x46, 0x70, 0x62, 0x8c, 0x9e, 0xa8, 0xba, 0xc4, 0xd6, 0xe0, 0xf2 }; -EXPORT_SYMBOL(crc7_be_syndrome_table); /** * crc7_be - update the CRC7 for the data buffer * @crc: previous CRC7 value * @buffer: data pointer @@ -63,11 +61,11 @@ EXPORT_SYMBOL(crc7_be_syndrome_table); * */ u8 crc7_be(u8 crc, const u8 *buffer, size_t len) { while (len--) - crc = crc7_be_byte(crc, *buffer++); + crc = crc7_be_syndrome_table[crc ^ *buffer++]; return crc; } EXPORT_SYMBOL(crc7_be); MODULE_DESCRIPTION("CRC7 calculations"); base-commit: 13f3d13d88b5dcba104a204fcbee61c75f8407d0 -- 2.48.1