From 92580b087558d87293d54db73df4123551494c45 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 1 Aug 2022 15:54:26 +0200 Subject: [PATCH] scripts: checkpatch: use `elsif` and make `%pA` an `ERROR` Signed-off-by: Joe Perches Co-developed-by: Miguel Ojeda Signed-off-by: Miguel Ojeda --- scripts/checkpatch.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index aef84390f0e657..bd0025d77bcf7b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -6782,19 +6782,19 @@ sub process { } if ($bad_specifier ne "") { my $stat_real = get_stat_real($linenr, $lc); + my $msg_level = \&WARN; my $ext_type = "Invalid"; my $use = ""; - if ($bad_specifier =~ /pA/) { - ERROR("VSPRINTF_RUST", - "'\%pA' is only intended to be used from Rust code\n" . "$here\n$stat_real\n"); - } if ($bad_specifier =~ /p[Ff]/) { $use = " - use %pS instead"; $use =~ s/pS/ps/ if ($bad_specifier =~ /pf/); + } elsif ($bad_specifier =~ /pA/) { + $use = " - '%pA' is only intended to be used from Rust code"; + $msg_level = \&ERROR; } - WARN("VSPRINTF_POINTER_EXTENSION", - "$ext_type vsprintf pointer extension '$bad_specifier'$use\n" . "$here\n$stat_real\n"); + &{$msg_level}("VSPRINTF_POINTER_EXTENSION", + "$ext_type vsprintf pointer extension '$bad_specifier'$use\n" . "$here\n$stat_real\n"); } } }