checkpatch: update $declaration_macros, add uninitialized_var (f8422308) · Commits · 戴 / test

Using uninitialized_var reports a false positive for "Missing blank line after declarations". Fix it by adding uninitialized_var to the $declaration_macros exceptions list. Move the macro list after $Type is declared. Add optional prefixes to DECLARE_<FOO> and DEFINE_<BAR> macro declarations to allow forms like: MLX4_DECLARE_DOORBELL_LOCK Signed-off-by:

Joe Perches <joe@perches.com> Reported-by:

Dotan Barak <dotanb@mellanox.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

scripts/checkpatch.pl

+6 −5

Original line number	Diff line number	Diff line
		@@ -423,11 +423,6 @@ foreach my $entry (@mode_permission_funcs) {
		$mode_perms_search .= $entry->[0];
		}

		our $declaration_macros = qr{(?x:
		(?:$Storage\s+)?(?:DECLARE\|DEFINE)_[A-Z]+\s*\(\|
		(?:$Storage\s+)?LIST_HEAD\s*\(
		)};

		our $allowed_asm_includes = qr{(?x:
		irq\|
		memory
		@@ -490,6 +485,12 @@ our $balanced_parens = qr/($(?:[^\($]++\|(?-1))*\))/;
		our $LvalOrFunc = qr{((?:[\&\]\s)?$Lval)\s($balanced_parens{0,1})\s};
		our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc\|$Constant)};

		our $declaration_macros = qr{(?x:
		(?:$Storage\s+)?(?:[A-Z_][A-Z0-9]_){0,2}(?:DEFINE\|DECLARE)(?:_[A-Z0-9]+){1,2}\s\(\|
		(?:$Storage\s+)?LIST_HEAD\s*\(\|
		(?:$Storage\s+)?${Type}\s+uninitialized_var\s*\(
		)};

		sub deparenthesize {
		my ($string) = @_;
		return "" if (!defined($string));

Admin message