Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c24f9f19 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

checkpatch: improve network block comment style checking 



Some comment styles in net and drivers/net are flagged inappropriately.

Avoid proclaiming inline comments like:
	int a = b;	/* some comment */
and block comments like:
	/*********************
	 * some comment
	 ********************/
are defective.

Tested with
$ cat drivers/net/t.c
/* foo */

/*
 * foo
 */

/* foo
 */

/* foo
 * bar */

/****************************
 * some long block comment
 ***************************/

struct foo {
	int bar;	/* another test */
};
$

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reported-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: David Miller <davem@davemloft.net>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3d70f8c6

scripts/checkpatch.pl

+4 −2
Original line number Diff line number Diff line
@@ -1890,8 +1890,10 @@ sub process { 
		}



		if ($realfile =~ m@^(drivers/net/|net/)@ &&

		    $rawline !~ m@^\+[ \t]*(\/\*|\*\/)@ &&

		    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {

		    $rawline !~ m@^\+[ \t]*\*/[ \t]*$@ &&	#trailing */

		    $rawline !~ m@^\+.*/\*.*\*/[ \t]*$@ &&	#inline /*...*/

		    $rawline !~ m@^\+.*\*{2,}/[ \t]*$@ &&	#trailing **/

		    $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) {	#non blank */

			WARN("NETWORKING_BLOCK_COMMENT_STYLE",

			     "networking block comments put the trailing */ on a separate line\n" . $herecurr);

		}