From: Bart Van Assche <bvanassche@acm.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Christoph Hellwig <hch@lst.de>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org,
Bart Van Assche <bvanassche@acm.org>,
Mark Salter <msalter@redhat.com>,
Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Subject: [PATCH 2/9] c6x: Include <linux/unaligned/generic.h> instead of duplicating it
Date: Mon, 28 Oct 2019 13:06:53 -0700 [thread overview]
Message-ID: <20191028200700.213753-3-bvanassche@acm.org> (raw)
In-Reply-To: <20191028200700.213753-1-bvanassche@acm.org>
Use the generic __{get,put}_unaligned_[bl]e() definitions instead of
duplicating these. Since a later patch will add more definitions into
<linux/unaligned/generic.h>, this patch ensures that these definitions
have to be added only once. See also commit a7f626c1948a ("C6X: headers").
See also commit 6510d41954dc ("kernel: Move arches to use common unaligned
access").
Cc: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
arch/c6x/include/asm/unaligned.h | 65 +-------------------------------
1 file changed, 1 insertion(+), 64 deletions(-)
diff --git a/arch/c6x/include/asm/unaligned.h b/arch/c6x/include/asm/unaligned.h
index b56ba7110f5a..d628cc170564 100644
--- a/arch/c6x/include/asm/unaligned.h
+++ b/arch/c6x/include/asm/unaligned.h
@@ -10,6 +10,7 @@
#define _ASM_C6X_UNALIGNED_H
#include <linux/swab.h>
+#include <linux/unaligned/generic.h>
/*
* The C64x+ can do unaligned word and dword accesses in hardware
@@ -100,68 +101,4 @@ static inline void put_unaligned64(u64 val, const void *p)
#endif
-/*
- * Cause a link-time error if we try an unaligned access other than
- * 1,2,4 or 8 bytes long
- */
-extern int __bad_unaligned_access_size(void);
-
-#define __get_unaligned_le(ptr) (typeof(*(ptr)))({ \
- sizeof(*(ptr)) == 1 ? *(ptr) : \
- (sizeof(*(ptr)) == 2 ? get_unaligned_le16((ptr)) : \
- (sizeof(*(ptr)) == 4 ? get_unaligned_le32((ptr)) : \
- (sizeof(*(ptr)) == 8 ? get_unaligned_le64((ptr)) : \
- __bad_unaligned_access_size()))); \
- })
-
-#define __get_unaligned_be(ptr) (__force typeof(*(ptr)))({ \
- sizeof(*(ptr)) == 1 ? *(ptr) : \
- (sizeof(*(ptr)) == 2 ? get_unaligned_be16((ptr)) : \
- (sizeof(*(ptr)) == 4 ? get_unaligned_be32((ptr)) : \
- (sizeof(*(ptr)) == 8 ? get_unaligned_be64((ptr)) : \
- __bad_unaligned_access_size()))); \
- })
-
-#define __put_unaligned_le(val, ptr) ({ \
- void *__gu_p = (ptr); \
- switch (sizeof(*(ptr))) { \
- case 1: \
- *(u8 *)__gu_p = (__force u8)(val); \
- break; \
- case 2: \
- put_unaligned_le16((__force u16)(val), __gu_p); \
- break; \
- case 4: \
- put_unaligned_le32((__force u32)(val), __gu_p); \
- break; \
- case 8: \
- put_unaligned_le64((__force u64)(val), __gu_p); \
- break; \
- default: \
- __bad_unaligned_access_size(); \
- break; \
- } \
- (void)0; })
-
-#define __put_unaligned_be(val, ptr) ({ \
- void *__gu_p = (ptr); \
- switch (sizeof(*(ptr))) { \
- case 1: \
- *(u8 *)__gu_p = (__force u8)(val); \
- break; \
- case 2: \
- put_unaligned_be16((__force u16)(val), __gu_p); \
- break; \
- case 4: \
- put_unaligned_be32((__force u32)(val), __gu_p); \
- break; \
- case 8: \
- put_unaligned_be64((__force u64)(val), __gu_p); \
- break; \
- default: \
- __bad_unaligned_access_size(); \
- break; \
- } \
- (void)0; })
-
#endif /* _ASM_C6X_UNALIGNED_H */
--
2.24.0.rc0.303.g954a862665-goog
next prev parent reply other threads:[~2019-10-28 20:07 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 20:06 [PATCH 0/9] Consolidate {get,put}_unaligned_[bl]e24() definitions Bart Van Assche
2019-10-28 20:06 ` [PATCH 1/9] linux/unaligned/byteshift.h: Remove superfluous casts Bart Van Assche
2019-10-28 20:06 ` Bart Van Assche [this message]
2019-11-07 3:09 ` [PATCH 2/9] c6x: Include <linux/unaligned/generic.h> instead of duplicating it Bart Van Assche
2019-11-07 13:54 ` Mark Salter
2019-10-28 20:06 ` [PATCH 3/9] treewide: Consolidate {get,put}_unaligned_[bl]e24() definitions Bart Van Assche
2019-10-28 20:06 ` [PATCH 4/9] drivers/iio: Sign extend without triggering implementation-defined behavior Bart Van Assche
2019-10-30 19:43 ` Jonathan Cameron
2019-10-30 20:02 ` Peter Zijlstra
2019-10-30 22:13 ` Douglas Gilbert
2019-10-31 17:55 ` Bart Van Assche
2019-10-28 20:06 ` [PATCH 5/9] scsi/st: Use get_unaligned_signed_be24() Bart Van Assche
2019-10-28 20:06 ` [PATCH 6/9] scsi/trace: Use get_unaligned_be*() Bart Van Assche
2019-10-28 20:06 ` [PATCH 7/9] arm/ecard: Use get_unaligned_le{16,24}() Bart Van Assche
2019-10-28 20:06 ` [PATCH 8/9] IB/qib: Sign extend without triggering implementation-defined behavior Bart Van Assche
2019-10-28 20:07 ` [PATCH 9/9] ASoC/fsl_spdif: Use put_unaligned_be24() instead of open-coding it Bart Van Assche
2019-10-28 20:24 ` Mark Brown
2019-10-28 20:49 ` Bart Van Assche
2019-10-28 21:52 ` [PATCH 0/9] Consolidate {get,put}_unaligned_[bl]e24() definitions Peter Zijlstra
2019-10-28 22:02 ` Bart Van Assche
2019-10-29 1:10 ` Douglas Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028200700.213753-3-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=hch@lst.de \
--cc=jacquiot.aurelien@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mingo@kernel.org \
--cc=msalter@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).