diff options
-rwxr-xr-x | scripts/checkpatch.pl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 260b324b6c31..93f8507b7ac2 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl | |||
@@ -29,6 +29,7 @@ my $mailback = 0; | |||
29 | my $summary_file = 0; | 29 | my $summary_file = 0; |
30 | my $show_types = 0; | 30 | my $show_types = 0; |
31 | my $fix = 0; | 31 | my $fix = 0; |
32 | my $fix_inplace = 0; | ||
32 | my $root; | 33 | my $root; |
33 | my %debug; | 34 | my %debug; |
34 | my %camelcase = (); | 35 | my %camelcase = (); |
@@ -76,6 +77,9 @@ Options: | |||
76 | "<inputfile>.EXPERIMENTAL-checkpatch-fixes" | 77 | "<inputfile>.EXPERIMENTAL-checkpatch-fixes" |
77 | with potential errors corrected to the preferred | 78 | with potential errors corrected to the preferred |
78 | checkpatch style | 79 | checkpatch style |
80 | --fix-inplace EXPERIMENTAL - may create horrible results | ||
81 | Is the same as --fix, but overwrites the input | ||
82 | file. It's your fault if there's no backup or git | ||
79 | --ignore-perl-version override checking of perl version. expect | 83 | --ignore-perl-version override checking of perl version. expect |
80 | runtime errors. | 84 | runtime errors. |
81 | -h, --help, --version display this help and exit | 85 | -h, --help, --version display this help and exit |
@@ -131,6 +135,7 @@ GetOptions( | |||
131 | 'mailback!' => \$mailback, | 135 | 'mailback!' => \$mailback, |
132 | 'summary-file!' => \$summary_file, | 136 | 'summary-file!' => \$summary_file, |
133 | 'fix!' => \$fix, | 137 | 'fix!' => \$fix, |
138 | 'fix-inplace!' => \$fix_inplace, | ||
134 | 'ignore-perl-version!' => \$ignore_perl_version, | 139 | 'ignore-perl-version!' => \$ignore_perl_version, |
135 | 'debug=s' => \%debug, | 140 | 'debug=s' => \%debug, |
136 | 'test-only=s' => \$tst_only, | 141 | 'test-only=s' => \$tst_only, |
@@ -140,6 +145,8 @@ GetOptions( | |||
140 | 145 | ||
141 | help(0) if ($help); | 146 | help(0) if ($help); |
142 | 147 | ||
148 | $fix = 1 if ($fix_inplace); | ||
149 | |||
143 | my $exit = 0; | 150 | my $exit = 0; |
144 | 151 | ||
145 | if ($^V && $^V lt $minimum_perl_version) { | 152 | if ($^V && $^V lt $minimum_perl_version) { |
@@ -4388,7 +4395,8 @@ sub process { | |||
4388 | hash_show_words(\%ignore_type, "Ignored"); | 4395 | hash_show_words(\%ignore_type, "Ignored"); |
4389 | 4396 | ||
4390 | if ($clean == 0 && $fix && "@rawlines" ne "@fixed") { | 4397 | if ($clean == 0 && $fix && "@rawlines" ne "@fixed") { |
4391 | my $newfile = $filename . ".EXPERIMENTAL-checkpatch-fixes"; | 4398 | my $newfile = $filename; |
4399 | $newfile .= ".EXPERIMENTAL-checkpatch-fixes" if (!$fix_inplace); | ||
4392 | my $linecount = 0; | 4400 | my $linecount = 0; |
4393 | my $f; | 4401 | my $f; |
4394 | 4402 | ||