From 010905ed2fdaea92116f5d2764073176c06dce31 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 4 Mar 2017 19:28:37 -0700 Subject: uti/lint/checkpatch: Fix __attribute__ struct errors for OPEN_BRACE The __attribute__((weak)) lines on structs were being read as functions, causing a warning that the brace should be on the next line. Add a check to see if it's a struct with an attribute, and ignore it for the OPEN_BRACE check if it is. Change-Id: Ieb0c96027e8df842f60ca7c9de7aac941eed1dc2 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/18570 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Lee Leahy --- util/lint/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/util/lint/checkpatch.pl b/util/lint/checkpatch.pl index 031aa34c82..9afa2324b5 100755 --- a/util/lint/checkpatch.pl +++ b/util/lint/checkpatch.pl @@ -3736,6 +3736,7 @@ 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!~/struct.*__attribute__\(\(.*\)\)/) and !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) { if (ERROR("OPEN_BRACE", "open brace '{' following function declarations go on the next line\n" . $herecurr) && -- cgit v1.2.3