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: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 9c209165f252..8a3b0fd67ad7 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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);