diff options
author | Arnd Bergmann <arnd@arndb.de> | 2021-05-08 01:07:57 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2021-05-17 14:30:29 +0300 |
commit | 803f4e1eab7a8938ba3a3c30dd4eb5e9eeef5e63 (patch) | |
tree | 4a7096939a4a914eedad1fba212cee0e88ba3ec5 /include/linux/unaligned/le_struct.h | |
parent | d40d8179482c330df5b9049797fe94c2e8eb4f6e (diff) | |
download | linux-803f4e1eab7a8938ba3a3c30dd4eb5e9eeef5e63.tar.xz |
asm-generic: simplify asm/unaligned.h
The get_unaligned()/put_unaligned() implementations are much more complex
than necessary, now that all architectures use the same code.
Move everything into one file and use a much more compact way to express
the same logic.
I've compared the binary output using gcc-11 across defconfig builds for
all architectures and found this patch to make no difference, except for
a single function on powerpc that needs two additional register moves
because of random differences in register allocation.
There are a handful of callers of the low-level __get_unaligned_cpu32,
so leave that in place for the time being even though the common code
no longer uses it.
This adds a warning for any caller of get_unaligned()/put_unaligned()
that passes in a single-byte pointer, but I've sent patches for all
instances that show up in x86 and randconfig builds. It would be nice
to change the arguments of the endian-specific accessors to take the
matching __be16/__be32/__be64/__le16/__le32/__le64 arguments instead of
a void pointer, but that requires more changes to the rest of the kernel.
This new version does allow aggregate types into get_unaligned(), which
was not the original goal but might come in handy.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/unaligned/le_struct.h')
-rw-r--r-- | include/linux/unaligned/le_struct.h | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/include/linux/unaligned/le_struct.h b/include/linux/unaligned/le_struct.h deleted file mode 100644 index 22f90a4afaa5..000000000000 --- a/include/linux/unaligned/le_struct.h +++ /dev/null @@ -1,67 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_UNALIGNED_LE_STRUCT_H -#define _LINUX_UNALIGNED_LE_STRUCT_H - -#include <linux/unaligned/packed_struct.h> - -static inline u16 get_unaligned_le16(const void *p) -{ - return __get_unaligned_cpu16((const u8 *)p); -} - -static inline u32 get_unaligned_le32(const void *p) -{ - return __get_unaligned_cpu32((const u8 *)p); -} - -static inline u64 get_unaligned_le64(const void *p) -{ - return __get_unaligned_cpu64((const u8 *)p); -} - -static inline void put_unaligned_le16(u16 val, void *p) -{ - __put_unaligned_cpu16(val, p); -} - -static inline void put_unaligned_le32(u32 val, void *p) -{ - __put_unaligned_cpu32(val, p); -} - -static inline void put_unaligned_le64(u64 val, void *p) -{ - __put_unaligned_cpu64(val, p); -} - -static inline u16 get_unaligned_be16(const void *p) -{ - return swab16(__get_unaligned_cpu16((const u8 *)p)); -} - -static inline u32 get_unaligned_be32(const void *p) -{ - return swab32(__get_unaligned_cpu32((const u8 *)p)); -} - -static inline u64 get_unaligned_be64(const void *p) -{ - return swab64(__get_unaligned_cpu64((const u8 *)p)); -} - -static inline void put_unaligned_be16(u16 val, void *p) -{ - __put_unaligned_cpu16(swab16(val), p); -} - -static inline void put_unaligned_be32(u32 val, void *p) -{ - __put_unaligned_cpu32(swab32(val), p); -} - -static inline void put_unaligned_be64(u64 val, void *p) -{ - __put_unaligned_cpu64(swab64(val), p); -} - -#endif /* _LINUX_UNALIGNED_LE_STRUCT_H */ |