diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 06:46:56 -0400 |
| commit | 9f9e4266a66b6f9dcde305e85035615c06bdb7f7 (patch) | |
| tree | c6f867c7a1bf94a3b4f13b19a9ce442c7aec9e79 /scripts | |
| parent | bf551413038f74343ec4d1413c3610e2362d0aeb (diff) | |
| parent | 249ce1387b7739dbea2ac1a697e4bf1e37ec06b7 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-twl6040
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 47016c304c84..66cad506b8a2 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
| @@ -3975,8 +3975,8 @@ sub string_find_replace { | |||
| 3975 | # check for new externs in .h files. | 3975 | # check for new externs in .h files. |
| 3976 | if ($realfile =~ /\.h$/ && | 3976 | if ($realfile =~ /\.h$/ && |
| 3977 | $line =~ /^\+\s*(extern\s+)$Type\s*$Ident\s*\(/s) { | 3977 | $line =~ /^\+\s*(extern\s+)$Type\s*$Ident\s*\(/s) { |
| 3978 | if (WARN("AVOID_EXTERNS", | 3978 | if (CHK("AVOID_EXTERNS", |
| 3979 | "extern prototypes should be avoided in .h files\n" . $herecurr) && | 3979 | "extern prototypes should be avoided in .h files\n" . $herecurr) && |
| 3980 | $fix) { | 3980 | $fix) { |
| 3981 | $fixed[$linenr - 1] =~ s/(.*)\bextern\b\s*(.*)/$1$2/; | 3981 | $fixed[$linenr - 1] =~ s/(.*)\bextern\b\s*(.*)/$1$2/; |
| 3982 | } | 3982 | } |