1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index b954de58304f..f1aad19b475c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2938,12 +2938,12 @@ sub process {
                while ($line =~ m{($Constant|$Lval)}g) {
                        my $var = $1;
                        if ($var !~ /$Constant/ &&
-                            $var =~ /[A-Z]\w*[a-z]|[a-z]\w*[A-Z]/ &&
+                            $var =~ /[A-Z][a-z]|[a-z][A-Z]/ &&
                            $var !~ /"^(?:Clear|Set|TestClear|TestSet|)Page[A-Z]/ &&
                            !defined $camelcase{$var}) {
                                $camelcase{$var} = 1;
-                                WARN("CAMELCASE",
+                                CHK("CAMELCASE",
-                                     "Avoid CamelCase: <$var>\n" . $herecurr);
+                                    "Avoid CamelCase: <$var>\n" . $herecurr);
                        }
                }

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index b954de58304f..f1aad19b475c 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl
@@ -2938,12 +2938,12 @@ sub process {
2938	while ($line =~ m{($Constant\|$Lval)}g) {	2938	while ($line =~ m{($Constant\|$Lval)}g) {
2939	my $var = $1;	2939	my $var = $1;
2940	if ($var !~ /$Constant/ &&	2940	if ($var !~ /$Constant/ &&
2941	$var =~ /[A-Z]\w[a-z]\|[a-z]\w[A-Z]/ &&	2941	$var =~ /[A-Z][a-z]\|[a-z][A-Z]/ &&
2942	$var !~ /"^(?:Clear\|Set\|TestClear\|TestSet\|)Page[A-Z]/ &&	2942	$var !~ /"^(?:Clear\|Set\|TestClear\|TestSet\|)Page[A-Z]/ &&
2943	!defined $camelcase{$var}) {	2943	!defined $camelcase{$var}) {
2944	$camelcase{$var} = 1;	2944	$camelcase{$var} = 1;
2945	WARN("CAMELCASE",	2945	CHK("CAMELCASE",
2946	"Avoid CamelCase: <$var>\n" . $herecurr);	2946	"Avoid CamelCase: <$var>\n" . $herecurr);
2947	}	2947	}
2948	}	2948	}
2949		2949