On Thu, 2018-02-01 at 22:50 +0000, Song Liu wrote:
> Hi Andy and Joe,
>
> I am getting the following ERROR from check patch.pl:
>
> ERROR: open brace '{' following function declarations go on the next line
> #235: FILE:
> tools/testing/selftests/bpf/test_stacktrace_map_build_id_offset.c:11:
> +struct bpf_map_def SEC("maps") control_map = {
>
>
> I guess it treats SEC("maps") as a function. But it is actually struct:
>
> struct bpf_map_def SEC("maps") control_map = {
> .type = BPF_MAP_TYPE_ARRAY,
> .key_size = sizeof(__u32),
> .value_size = sizeof(__u32),
> .max_entries = 1,
> };
This seems to work better:
---
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 78e7a310af46..b6a0da9c7de7 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3919,8 +3919,10 @@ sub process {
# function brace can't be on same line, except for #defines of do while,
# or if closed on same line
- if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and
- !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
+ if ($^V && $^V ge 5.10.0 &&
+ ($sline =~ /$Type\s*$Ident\s*$balanced_parens\s*{/) &&
+ !($sline =~ /\#\s*define\b.*do\s*\{/) &&
+ $sline !~ /}/) {
if (ERROR("OPEN_BRACE",
"open brace '{' following function
declarations go on the next line\n" . $herecurr) &&
$fix) {
