checkpatch: Fix bracing false positives on #else

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 55ef439865a5c8924e6b319566886a62903e8e24..4fa06c002ec14d10f26dbd8a3410018056a2dc49 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2536,7 +2536,8 @@ sub process {
                        }
                }
                if (!defined $suppress_ifbraces{$linenr - 1} &&
-                                       $line =~ /\b(if|while|for|else)\b/) {
+                                       $line =~ /\b(if|while|for|else)\b/ &&
+                                       $line !~ /\#\s*else/) {
                        my $allowed = 0;
 
                        # Check the pre-context.