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

lib: crc_ccitt_false() is identical to crc_itu_t()

crc_ccitt_false() was introduced in commit 0d85adb5fbd33 ("lib/crc-ccitt:
Add CCITT-FALSE CRC16 variant"), but it is redundant with crc_itu_t().
Since the latter is more used, it is the one being kept.

Link: https://lkml.kernel.org/r/20231219131154.748577-1-Mathis.Marion@silabs.com
Signed-off-by: Mathis Marion <mathis.marion@silabs.com>
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
Cc: Jérôme Pouiller <jerome.pouiller@silabs.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mathis Marion and committed by
Andrew Morton
90ca2251 bc09d1de

+7 -69
+1 -1
Documentation/driver-api/surface_aggregator/ssh.rst
··· 39 39 document: All of this has been reverse-engineered and may thus be erroneous 40 40 and/or incomplete. 41 41 42 - All CRCs used in the following are two-byte ``crc_ccitt_false(0xffff, ...)``. 42 + All CRCs used in the following are two-byte ``crc_itu_t(0xffff, ...)``. 43 43 All multi-byte values are little-endian, there is no implicit padding between 44 44 values. 45 45
+1 -1
drivers/mfd/Kconfig
··· 2255 2255 config RAVE_SP_CORE 2256 2256 tristate "RAVE SP MCU core driver" 2257 2257 depends on SERIAL_DEV_BUS 2258 - select CRC_CCITT 2258 + select CRC_ITU_T 2259 2259 help 2260 2260 Select this to get support for the Supervisory Processor 2261 2261 device found on several devices in RAVE line of hardware.
+2 -2
drivers/mfd/rave-sp.c
··· 9 9 */ 10 10 11 11 #include <linux/atomic.h> 12 - #include <linux/crc-ccitt.h> 12 + #include <linux/crc-itu-t.h> 13 13 #include <linux/delay.h> 14 14 #include <linux/export.h> 15 15 #include <linux/init.h> ··· 251 251 252 252 static void csum_ccitt(const u8 *buf, size_t size, u8 *crc) 253 253 { 254 - const u16 calculated = crc_ccitt_false(0xffff, buf, size); 254 + const u16 calculated = crc_itu_t(0xffff, buf, size); 255 255 256 256 /* 257 257 * While the rest of the wire protocol is little-endian,
+1 -1
drivers/platform/surface/aggregator/Kconfig
··· 5 5 tristate "Microsoft Surface System Aggregator Module Subsystem and Drivers" 6 6 depends on SERIAL_DEV_BUS 7 7 depends on ACPI && !RISCV 8 - select CRC_CCITT 8 + select CRC_ITU_T 9 9 help 10 10 The Surface System Aggregator Module (Surface SAM or SSAM) is an 11 11 embedded controller (EC) found on 5th- and later-generation Microsoft
-7
include/linux/crc-ccitt.h
··· 5 5 #include <linux/types.h> 6 6 7 7 extern u16 const crc_ccitt_table[256]; 8 - extern u16 const crc_ccitt_false_table[256]; 9 8 10 9 extern u16 crc_ccitt(u16 crc, const u8 *buffer, size_t len); 11 - extern u16 crc_ccitt_false(u16 crc, const u8 *buffer, size_t len); 12 10 13 11 static inline u16 crc_ccitt_byte(u16 crc, const u8 c) 14 12 { 15 13 return (crc >> 8) ^ crc_ccitt_table[(crc ^ c) & 0xff]; 16 - } 17 - 18 - static inline u16 crc_ccitt_false_byte(u16 crc, const u8 c) 19 - { 20 - return (crc << 8) ^ crc_ccitt_false_table[(crc >> 8) ^ c]; 21 14 } 22 15 23 16 #endif /* _LINUX_CRC_CCITT_H */
+2 -2
include/linux/surface_aggregator/serial_hub.h
··· 12 12 #ifndef _LINUX_SURFACE_AGGREGATOR_SERIAL_HUB_H 13 13 #define _LINUX_SURFACE_AGGREGATOR_SERIAL_HUB_H 14 14 15 - #include <linux/crc-ccitt.h> 15 + #include <linux/crc-itu-t.h> 16 16 #include <linux/kref.h> 17 17 #include <linux/ktime.h> 18 18 #include <linux/list.h> ··· 188 188 */ 189 189 static inline u16 ssh_crc(const u8 *buf, size_t len) 190 190 { 191 - return crc_ccitt_false(0xffff, buf, len); 191 + return crc_itu_t(0xffff, buf, len); 192 192 } 193 193 194 194 /*
-55
lib/crc-ccitt.c
··· 49 49 }; 50 50 EXPORT_SYMBOL(crc_ccitt_table); 51 51 52 - /* 53 - * Similar table to calculate CRC16 variant known as CRC-CCITT-FALSE 54 - * Reflected bits order, does not augment final value. 55 - */ 56 - u16 const crc_ccitt_false_table[256] = { 57 - 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7, 58 - 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF, 59 - 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6, 60 - 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE, 61 - 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485, 62 - 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D, 63 - 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4, 64 - 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC, 65 - 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823, 66 - 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B, 67 - 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12, 68 - 0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A, 69 - 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41, 70 - 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49, 71 - 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70, 72 - 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78, 73 - 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F, 74 - 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067, 75 - 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E, 76 - 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256, 77 - 0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D, 78 - 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405, 79 - 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C, 80 - 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634, 81 - 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB, 82 - 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3, 83 - 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A, 84 - 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92, 85 - 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9, 86 - 0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1, 87 - 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8, 88 - 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0 89 - }; 90 - EXPORT_SYMBOL(crc_ccitt_false_table); 91 - 92 52 /** 93 53 * crc_ccitt - recompute the CRC (CRC-CCITT variant) for the data 94 54 * buffer ··· 63 103 return crc; 64 104 } 65 105 EXPORT_SYMBOL(crc_ccitt); 66 - 67 - /** 68 - * crc_ccitt_false - recompute the CRC (CRC-CCITT-FALSE variant) 69 - * for the data buffer 70 - * @crc: previous CRC value 71 - * @buffer: data pointer 72 - * @len: number of bytes in the buffer 73 - */ 74 - u16 crc_ccitt_false(u16 crc, u8 const *buffer, size_t len) 75 - { 76 - while (len--) 77 - crc = crc_ccitt_false_byte(crc, *buffer++); 78 - return crc; 79 - } 80 - EXPORT_SYMBOL(crc_ccitt_false); 81 106 82 107 MODULE_DESCRIPTION("CRC-CCITT calculations"); 83 108 MODULE_LICENSE("GPL");