From: Paul Walmsley <paul.walmsley@sifive.com>
To: linux-riscv@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 3/8] riscv: init: merge split string literals in preprocessor directive
Date: Thu, 17 Oct 2019 17:49:24 -0700 [thread overview]
Message-ID: <20191018004929.3445-4-paul.walmsley@sifive.com> (raw)
In-Reply-To: <20191018004929.3445-1-paul.walmsley@sifive.com>
sparse complains loudly when string literals associated with
preprocessor directives are split into multiple, separately quoted
strings across different lines:
arch/riscv/mm/init.c:341:9: error: Expected ; at the end of type declaration
arch/riscv/mm/init.c:341:9: error: got "not use absolute addressing."
arch/riscv/mm/init.c:358:9: error: Trying to use reserved word 'do' as identifier
arch/riscv/mm/init.c:358:9: error: Expected ; at end of declaration
[ ... ]
The compiler doesn't seem to mind the split string literal, but it's
pretty ugly to my eyes - enough to outweigh the value of the 80-column
warning from checkpatch. Fix by concatenating the strings.
This patch should have no functional impact.
Signed-off-by: Paul Walmsley <paul.walmsley@sifive.com>
---
arch/riscv/mm/init.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index fa8748a74414..fe68e94ea946 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -339,8 +339,7 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size)
*/
#ifndef __riscv_cmodel_medany
-#error "setup_vm() is called from head.S before relocate so it should "
- "not use absolute addressing."
+#error "setup_vm() is called from head.S before relocate so it should not use absolute addressing."
#endif
asmlinkage void __init setup_vm(uintptr_t dtb_pa)
--
2.23.0
next prev parent reply other threads:[~2019-10-18 0:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 0:49 [PATCH 0/8] riscv: resolve most warnings from sparse Paul Walmsley
2019-10-18 0:49 ` [PATCH 1/8] riscv: add prototypes for assembly language functions from entry.S Paul Walmsley
2019-10-18 0:49 ` [PATCH 2/8] riscv: add prototypes for assembly language functions from head.S Paul Walmsley
2019-10-18 1:15 ` Paul Walmsley
2019-10-18 0:49 ` Paul Walmsley [this message]
2019-10-18 4:02 ` [PATCH 3/8] riscv: init: merge split string literals in preprocessor directive Luc Van Oostenryck
2019-10-18 4:38 ` Paul Walmsley
2019-10-18 5:28 ` Luc Van Oostenryck
2019-10-18 5:47 ` Luc Van Oostenryck
2019-10-18 6:08 ` Paul Walmsley
2019-10-18 0:49 ` [PATCH 4/8] riscv: ensure RISC-V C model definitions are passed to static analyzers Paul Walmsley
2019-10-18 4:06 ` Luc Van Oostenryck
2019-10-18 4:39 ` Paul Walmsley
2019-10-18 5:25 ` Luc Van Oostenryck
2019-10-22 15:09 ` Palmer Dabbelt
2019-10-28 22:11 ` Luc Van Oostenryck
2019-10-18 0:49 ` [PATCH 5/8] riscv: add missing prototypes Paul Walmsley
2019-10-18 4:15 ` Luc Van Oostenryck
2019-10-18 6:06 ` Paul Walmsley
2019-10-18 0:49 ` [PATCH 6/8] riscv: mark some code and data as file-static Paul Walmsley
2019-10-18 0:49 ` [PATCH 7/8] riscv: add missing header file includes Paul Walmsley
2019-10-18 0:49 ` [PATCH 8/8] riscv: fp: add missing __user pointer annotations Paul Walmsley
2019-10-18 3:12 ` [PATCH 0/8] riscv: resolve most warnings from sparse Anup Patel
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=20191018004929.3445-4-paul.walmsley@sifive.com \
--to=paul.walmsley@sifive.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
/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).