From b8c0e326a3dbcd9c526b9d7fb9756b8c9f4ac6b4 Mon Sep 17 00:00:00 2001 From: Elyes Haouas Date: Tue, 1 Aug 2023 18:39:07 +0200 Subject: [PATCH] lint/checkpatch: Add check for unnecessary int declarations This reduce the difference with linux v6.5-rc4. Change-Id: I64bbc09b531ea217514601386dd517af92aa40f1 Signed-off-by: Elyes Haouas Reviewed-on: https://review.coreboot.org/c/coreboot/+/70200 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) --- util/lint/checkpatch.pl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl index c843c6cc6b..c4e9ac8e41 100755 --- a/util/lint/checkpatch.pl +++ b/util/lint/checkpatch.pl @@ -4214,6 +4214,26 @@ sub process { "type '$tmp' should be specified in [[un]signed] [short|int|long|long long] order\n" . $herecurr); } +# check for unnecessary int declarations of short/long/long long + while ($sline =~ m{\b($TypeMisordered(\s*\*)*|$C90_int_types)\b}g) { + my $type = trim($1); + next if ($type !~ /\bint\b/); + next if ($type !~ /\b(?:short|long\s+long|long)\b/); + my $new_type = $type; + $new_type =~ s/\b\s*int\s*\b/ /; + $new_type =~ s/\b\s*(?:un)?signed\b\s*/ /; + $new_type =~ s/^const\s+//; + $new_type = "unsigned $new_type" if ($type =~ /\bunsigned\b/); + $new_type = "const $new_type" if ($type =~ /^const\b/); + $new_type =~ s/\s+/ /g; + $new_type = trim($new_type); + if (WARN("UNNECESSARY_INT", + "Prefer '$new_type' over '$type' as the int is unnecessary\n" . $herecurr) && + $fix) { + $fixed[$fixlinenr] =~ s/\b\Q$type\E\b/$new_type/; + } + } + # check for static const char * arrays. if ($line =~ /\bstatic\s+const\s+char\s*\*\s*(\w+)\s*\[\s*\]\s*=\s*/) { WARN("STATIC_CONST_CHAR_ARRAY",