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

Commit d2506586 authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

checkpatch: possible modifiers -- handle multiple modifiers and trailing 



Add support for multiple modifiers such as:

	int __one __two foo;

Also handle trailing known modifiers when defecting modifiers:

	int __one foo __read_mostly;

Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0221f55c

scripts/checkpatch.pl

+5 −3
Original line number Diff line number Diff line
@@ -859,8 +859,10 @@ sub possible { 


		} elsif ($possible =~ /\s/) {

			$possible =~ s/\s*$Type\s*//g;

			warn "MODIFIER: $possible ($line)\n" if ($dbg_possible);

			push(@modifierList, $possible);

			for my $modifier (split(' ', $possible)) {

				warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);

				push(@modifierList, $modifier);

			}



		} else {

			warn "POSSIBLE: $possible ($line)\n" if ($dbg_possible);
@@ -1186,7 +1188,7 @@ sub process { 
			} elsif ($s =~ /^.\s*$Ident\s*\(/s) {



			# declarations always start with types

			} elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))\s*(?:;|=|,|\()/s) {

			} elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+?)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))(?:\s*$Modifier)?\s*(?:;|=|,|\()/s) {

				my $type = $1;

				$type =~ s/\s+/ /g;

				possible($type, "A:" . $s);