The patch titled Subject: checkpatch: add #define foo "string" long line exception has been added to the -mm tree. Its filename is checkpatch-add-define-foo-string-long-line-exception.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/checkpatch-add-define-foo-string-long-line-exception.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/checkpatch-add-define-foo-string-long-line-exception.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Joe Perches <joe@xxxxxxxxxxx> Subject: checkpatch: add #define foo "string" long line exception There are #defines with long string constants like: #define foo "some really long string > 80 columns" Add a long line exception for them. Miscellanea: Use the $String variable for slightly better readability Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Reported-by: Madalin-Cristian Bucur <madalin.bucur@xxxxxxxxxxxxx> Cc: Andy Whitcroft <apw@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff -puN scripts/checkpatch.pl~checkpatch-add-define-foo-string-long-line-exception scripts/checkpatch.pl --- a/scripts/checkpatch.pl~checkpatch-add-define-foo-string-long-line-exception +++ a/scripts/checkpatch.pl @@ -2513,8 +2513,9 @@ sub process { #line length limit if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && $rawline !~ /^.\s*\*\s*\@$Ident\s/ && - !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:|,|\)\s*;)\s*$/ || - $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) && + !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?$String\s*(?:|,|\)\s*;)\s*$/ || + $line =~ /^\+\s*$String\s*(?:\s*|,|\)\s*;)\s*$/ || + $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) && $length > $max_line_length) { WARN("LONG_LINE", _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are ocfs2-logging-remove-static-buffer-use-vsprintf-extension-%pv.patch ocfs2-neaten-do_error-ocfs2_error-and-ocfs2_abort.patch slub-use-bool-function-return-values-of-true-false-not-1-0.patch proc-show-locks-in-proc-pid-fdinfo-x.patch proc-show-locks-in-proc-pid-fdinfo-x-v2.patch maintainers-use-tabs-consistently.patch maintainers-credits-remove-stefano-brivio-from-b43.patch x86-mtrr-if-remove-use-of-seq_printf-return-value.patch power-wakeup-remove-use-of-seq_printf-return-value.patch rtc-remove-use-of-seq_printf-return-value.patch ipc-remove-use-of-seq_printf-return-value.patch microblaze-mb-remove-use-of-seq_printf-return-value.patch microblaze-mb-remove-use-of-seq_printf-return-value-fix.patch nios2-cpuinfo-remove-use-of-seq_printf-return-value.patch arm-plat-pxa-remove-use-of-seq_printf-return-value.patch openrisc-remove-use-of-seq_printf-return-value.patch cris-remove-use-of-seq_printf-return-value.patch cris-fasttimer-remove-use-of-seq_printf-return-value.patch s390-remove-use-of-seq_printf-return-value.patch proc-remove-use-of-seq_printf-return-value.patch cgroup-remove-use-of-seq_printf-return-value.patch tracing-remove-use-of-seq_printf-return-value.patch lru_cache-remove-use-of-seq_printf-return-value.patch parisc-remove-use-of-seq_printf-return-value.patch lib-vsprintfc-even-faster-decimal-conversion.patch mm-utilc-add-kstrimdup.patch checkpatch-improve-no-space-is-necessary-after-a-cast-test.patch checkpatch-add-spell-checking-of-email-subject-line.patch checkpatch-spell-check-reudce.patch checkpatch-add-optional-codespell-dictionary-to-find-more-typos.patch checkpatch-match-more-world-writable-permissions.patch checkpatch-match-more-world-writable-permissions-fix.patch checkpatch-improve-return-negative-errno-check.patch checkpatch-add-test-for-repeated-const-uses.patch checkpatch-dont-ask-for-asm-fileh-to-linux-fileh-unconditionally.patch checkpatch-submittingpatches-suggest-line-wrapping-commit-messages-at-75-columns.patch checkpatch-add-define-foo-string-long-line-exception.patch adfs-returning-correct-return-values.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html