diff --git a/[refs] b/[refs] index fe0578b00989..7d16b0496b5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc0d8d944df0c58cd810f33db82f87dcf5dcc190 +refs/heads/master: 463f28648586721c2191130c9b3c27589dcc11a0 diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl index 2d5ece798c4c..fd6481649258 100755 --- a/trunk/scripts/checkpatch.pl +++ b/trunk/scripts/checkpatch.pl @@ -1372,6 +1372,8 @@ sub process { # Ignore functions being called } elsif ($s =~ /^.\s*$Ident\s*\(/s) { + } elsif ($s =~ /^.\s*else\b/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*$Modifier)?\s*(?:;|=|,|\()/s) { my $type = $1;