1 files changed, 11 insertions, 2 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 377f373db6c0..93e84c9504a1 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3890,14 +3890,23 @@ sub process {
                         WARN("STATIC_CONST_CHAR_ARRAY",
                              "static const char * array should probably be static const char * const\n" .
                                 $herecurr);
-               }
+                }
+
+# check for initialized const char arrays that should be static const
+                if ($line =~ /^\+\s*const\s+(char|unsigned\s+char|_*u8|(?:[us]_)?int8_t)\s+\w+\s*\[\s*(?:\w+\s*)?\]\s*=\s*"/) {
+                        if (WARN("STATIC_CONST_CHAR_ARRAY",
+                                 "const array should probably be static const\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/(^.\s*)const\b/${1}static const/;
+                        }
+                }
 
 # check for static char foo[] = "bar" declarations.
                 if ($line =~ /\bstatic\s+char\s+(\w+)\s*\[\s*\]\s*=\s*"/) {
                         WARN("STATIC_CONST_CHAR_ARRAY",
                              "static char array declaration should probably be static const char\n" .
                                 $herecurr);
-               }
+                }
 
 # check for const <foo> const where <foo> is not a pointer or array type
                 if ($sline =~ /\bconst\s+($BasicType)\s+const\b/) {