The patch titled Subject: scripts/checkpatch.pl: remove _deferred and _deferred_once false warning has been removed from the -mm tree. Its filename was scripts-checkpatchpl-remove-_deferred-and-_deferred_once-false-warning.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Maninder Singh <maninder1.s@xxxxxxxxxxx> Subject: scripts/checkpatch.pl: remove _deferred and _deferred_once false warning With commit 98e35f5894cf ("printk: git rid of [sched_delayed] message for printk_deferred") printk_deferred and printk_deferred_once require LOGLEVEL in argument, but checkpatch.pl was not fixed and still reports it as warning: WARNING: Possible unnecessary KERN_ALERT printk_deferred(KERN_ALERT "checking deferred "); As suggested by Andy, made 2 functions from logFunction. 1. logFunction: with all checks 2. logFunctionCore: without printk(?:_ratelimited|_once|_deferred) checking and call logFunctionCore instead of logFunction for checking of loglevel, which will exclude checking of printk(?:_ratelimited|_once|_deferred). This way, there is no need to maintain same stanza at multiple places for removing printk flavours. Link: https://lkml.kernel.org/r/20220202103309.1914992-1-maninder1.s@xxxxxxxxxxx Co-developed-by: Vaneet Narang <v.narang@xxxxxxxxxxx> Signed-off-by: Vaneet Narang <v.narang@xxxxxxxxxxx> Signed-off-by: Maninder Singh <maninder1.s@xxxxxxxxxxx> Cc: Andy Whitcroft <apw@xxxxxxxxxxxxx> Cc: Dwaipayan Ray <dwaipayanray1@xxxxxxxxx> Cc: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> Cc: Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx> Cc: Jan Kara <jack@xxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- scripts/checkpatch.pl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/scripts/checkpatch.pl~scripts-checkpatchpl-remove-_deferred-and-_deferred_once-false-warning +++ a/scripts/checkpatch.pl @@ -584,8 +584,7 @@ our $typeTypedefs = qr{(?x: our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b}; -our $logFunctions = qr{(?x: - printk(?:_ratelimited|_once|_deferred_once|_deferred|)| +our $logFunctionsCore = qr{(?x: (?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)| TP_printk| WARN(?:_RATELIMIT|_ONCE|)| @@ -594,6 +593,11 @@ our $logFunctions = qr{(?x: seq_vprintf|seq_printf|seq_puts )}; +our $logFunctions = qr{(?x: + printk(?:_ratelimited|_once|_deferred_once|_deferred|)| + $logFunctionsCore +)}; + our $allocFunctions = qr{(?x: (?:(?:devm_)? (?:kv|k|v)[czm]alloc(?:_array)?(?:_node)? | @@ -6312,8 +6316,7 @@ sub process { } # check for logging functions with KERN_<LEVEL> - if ($line !~ /printk(?:_ratelimited|_once)?\s*\(/ && - $line =~ /\b$logFunctions\s*\(.*\b(KERN_[A-Z]+)\b/) { + if ($line =~ /\b$logFunctionsCore\s*\(.*\b(KERN_[A-Z]+)\b/) { my $level = $1; if (WARN("UNNECESSARY_KERN_LEVEL", "Possible unnecessary $level\n" . $herecurr) && _ Patches currently in -mm which might be from maninder1.s@xxxxxxxxxxx are kallsyms-print-module-name-in-%ps-s-case-when-kallsyms-is-disabled.patch