Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce4320dd authored by Bob Pearson's avatar Bob Pearson Committed by Linus Torvalds
Browse files

crc32: fix mixing of endian-specific types 



crc32.c in its original version freely mixed u32, __le32 and __be32 types
which caused warnings from sparse with __CHECK_ENDIAN__.  This patch fixes
these by forcing the types to u32.

[djwong@us.ibm.com: Minor changelog tweaks]
Signed-off-by: default avatarBob Pearson <rpearson@systemfabricworks.com>
Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 60e58d5c

lib/crc32.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -28,13 +28,13 @@ 
#include "crc32defs.h"

#include "crc32defs.h"





#if CRC_LE_BITS == 8

#if CRC_LE_BITS == 8

# define tole(x) __constant_cpu_to_le32(x)

# define tole(x) ((__force u32) __constant_cpu_to_le32(x))

#else

#else

# define tole(x) (x)

# define tole(x) (x)

#endif

#endif





#if CRC_BE_BITS == 8

#if CRC_BE_BITS == 8

# define tobe(x) __constant_cpu_to_be32(x)

# define tobe(x) ((__force u32) __constant_cpu_to_be32(x))

#else

#else

# define tobe(x) (x)

# define tobe(x) (x)

#endif

#endif
@@ -128,9 +128,9 @@ u32 __pure crc32_le(u32 crc, unsigned char const *p, size_t len) 
# elif CRC_LE_BITS == 8

# elif CRC_LE_BITS == 8

	const u32      (*tab)[] = crc32table_le;

	const u32      (*tab)[] = crc32table_le;





	crc = __cpu_to_le32(crc);

	crc = (__force u32) __cpu_to_le32(crc);

	crc = crc32_body(crc, p, len, tab);

	crc = crc32_body(crc, p, len, tab);

	crc = __le32_to_cpu(crc);

	crc = __le32_to_cpu((__force __le32)crc);

#endif

#endif

	return crc;

	return crc;

}

}
@@ -171,9 +171,9 @@ u32 __pure crc32_be(u32 crc, unsigned char const *p, size_t len) 
# elif CRC_BE_BITS == 8

# elif CRC_BE_BITS == 8

	const u32      (*tab)[] = crc32table_be;

	const u32      (*tab)[] = crc32table_be;





	crc = __cpu_to_be32(crc);

	crc = (__force u32) __cpu_to_be32(crc);

	crc = crc32_body(crc, p, len, tab);

	crc = crc32_body(crc, p, len, tab);

	crc = __be32_to_cpu(crc);

	crc = __be32_to_cpu((__force __be32)crc);

# endif

# endif

	return crc;

	return crc;

}

}