From 93da8dc478a755e70d99a309cb1d298495105814 Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Tue, 2 Jun 2020 12:38:11 -0500
Subject: [PATCH] Revert "checkpatch: update checkpatch to warn about C99 type
 usage"

Now that we are standardizing C99 integer types we can revert the commit
that warned about C99 type usage.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 .checkpatch.conf      |  1 +
 scripts/checkpatch.pl | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.checkpatch.conf b/.checkpatch.conf
index a594d6f5e28..4518ede4e24 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -10,6 +10,7 @@
 --ignore SPLIT_STRING
 --ignore VOLATILE
 --ignore CONFIG_EXPERIMENTAL
+--ignore PREFER_KERNEL_TYPES
 --ignore AVOID_EXTERNS
 --ignore NETWORKING_BLOCK_COMMENT_STYLE
 --ignore DATE_TIME
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c460d9e2692..090854b5bd3 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -450,7 +450,7 @@ our $typeOtherOSTypedefs = qr{(?x:
 	u(?:nchar|short|int|long)            # sysv
 )};
 our $typeKernelTypedefs = qr{(?x:
-	(?:__)?(?:u|s|be|le)(?:8|16|32|64)_t|
+	(?:__)?(?:u|s|be|le)(?:8|16|32|64)|
 	atomic_t
 )};
 our $typeTypedefs = qr{(?x:
@@ -5953,17 +5953,21 @@ sub process {
 			      "Using weak declarations can have unintended link defects\n" . $herecurr);
 		}
 
-# check for c99 types like uint8_t
-		if ($line =~ /\b($Declare)\s*$Ident\s*[=;,\[]/) {
+# check for c99 types like uint8_t used outside of uapi/
+		if ($realfile !~ m@\binclude/uapi/@ &&
+		    $line =~ /\b($Declare)\s*$Ident\s*[=;,\[]/) {
 			my $type = $1;
 			if ($type =~ /\b($typeC99Typedefs)\b/) {
 				$type = $1;
 				my $kernel_type = 'u';
 				$kernel_type = 's' if ($type =~ /^_*[si]/);
 				$type =~ /(\d+)/;
-				$kernel_type .= $1.'_t';
-				WARN("PREFER_KERNEL_TYPES",
-					"Prefer kernel type '$kernel_type' over '$type'\n" . $herecurr)
+				$kernel_type .= $1;
+				if (CHK("PREFER_KERNEL_TYPES",
+					"Prefer kernel type '$kernel_type' over '$type'\n" . $herecurr) &&
+				    $fix) {
+					$fixed[$fixlinenr] =~ s/\b$type\b/$kernel_type/;
+				}
 			}
 		}