1 files changed, 10 insertions, 2 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 42103a0cdbc0..c03e4278b07c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -443,7 +443,7 @@ sub seed_camelcase_file {
                 if ($line =~ /^[ \t]*(?:#[ \t]*define|typedef\s+$Type)\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)/) {
                         $camelcase{$1} = 1;
                 }
-                elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*\(/) {
+                elsif ($line =~ /^\s*$Declare\s+(\w*(?:[A-Z][a-z]|[a-z][A-Z])\w*)\s*[\(\[,;]/) {
                         $camelcase{$1} = 1;
                 }
         }
@@ -1612,6 +1612,8 @@ sub process {
         my @setup_docs = ();
         my $setup_docs = 0;
 
+        my $camelcase_file_seeded = 0;
+
         sanitise_line_reset();
         my $line;
         foreach my $rawline (@rawlines) {
@@ -3394,7 +3396,13 @@ sub process {
                                 while ($var =~ m{($Ident)}g) {
                                         my $word = $1;
                                         next if ($word !~ /[A-Z][a-z]|[a-z][A-Z]/);
-                                        seed_camelcase_includes() if ($check);
+                                        if ($check) {
+                                                seed_camelcase_includes();
+                                                if (!$file && !$camelcase_file_seeded) {
+                                                        seed_camelcase_file($realfile);
+                                                        $camelcase_file_seeded = 1;
+                                                }
+                                        }
                                         if (!defined $camelcase{$word}) {
                                                 $camelcase{$word} = 1;
                                                 CHK("CAMELCASE",