Skip to contentSkip to conversation

checkpatch regression: error on #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

DISCUSSION Joe Perches 2 participants 3 messages Jan 11, 2012 – Jan 20, 2012

lore
Share & tools
lore
#0 lore raw

Current checkpatch gives:

ERROR: Macros with complex values should be enclosed in parenthesis #18: FILE: net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:18:
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

due to:

commit b3dfb9bc52e9a751e47bbc92d3a3f07e9a0029c5

Author: Andy Whitcroft <[email protected]>
Date:   Thu Dec 22 16:04:25 2011 +1100

checkpatch: correctly track the end of preprocessor commands in context

When looking for a statement we currently run on through preprocessor commands. This means that a header file with just definitions is parsed over and over again combining all of the lines from the current line to the end of file leading to severe performance issues.

Fix up context accumulation to track preprocessor commands and stop when reaching the end of them. At the same time vastly simplify the #define handling.

#1 lore raw
Quoted 6 lines · Joe Perches

Current checkpatch gives:

ERROR: Macros with complex values should be enclosed in parenthesis #18: FILE: net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:18:
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

Quoted 7 lines

due to:

commit b3dfb9bc52e9a751e47bbc92d3a3f07e9a0029c5
Author: Andy Whitcroft <[email protected]>
Date:   Thu Dec 22 16:04:25 2011 +1100

   checkpatch: correctly track the end of preprocessor commands in context

That one is hard to detect as being a 'string' and therefore ok.

Ok, looks like we can detect the string concatenation occuring here and handle this better. Does the below version work better for you:

http://people.canonical.com/~apw/checkpatch/checkpatch-next.pl

-apw

#2 lore raw
Quoted 5 lines · Andy Whitcroft
Quoted 4 lines · Joe Perches

Current checkpatch gives:
ERROR: Macros with complex values should be enclosed in parenthesis #18: FILE: net/ethernet/broadcom/bnx2x/bnx2x_cmn.c:18:
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

[]

Quoted 2 lines

Does the below version work better for you:
http://people.canonical.com/~apw/checkpatch/checkpatch-next.pl

Diff is basically:

+ # Flatten any obvious string concatentation.
+ while ($dstat =~ s/("X*")\s*$Ident/$1/ ||
+ $dstat =~ s/$Ident\s*("X*")/$1/)
+ {
+ }

Yes, that works and is appropriate.