checkpatch: DEFINE_ macros are real definitions for exports

When we want to confirm an export is directly after its definition we need
to allow for DEFINE_ style macros.  Add these to the execeptions.
Refactor the exceptions.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 54dfa2b543dd..a675f067b572 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1573,13 +1573,14 @@ sub process {
                 if (($line =~ /EXPORT_SYMBOL.*\((.*)\)/) ||
                     ($line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
                         my $name = $1;
-                        if (($prevline !~ /^}/) &&
-                           ($prevline !~ /^\+}/) &&
-                           ($prevline !~ /^ }/) &&
-                           ($prevline !~ /^.DECLARE_$Ident\(\Q$name\E\)/) &&
-                           ($prevline !~ /^.LIST_HEAD\(\Q$name\E\)/) &&
-                           ($prevline !~ /^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(/) &&
-                           ($prevline !~ /\b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[)/)) {
+                        if ($prevline !~ /(?:
+                                ^.}|
+                                ^.DEFINE_$Ident\(\Q$name\E\)|
+                                ^.DECLARE_$Ident\(\Q$name\E\)|
+                                ^.LIST_HEAD\(\Q$name\E\)|
+                                ^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(|
+                                \b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[)
+                            )/x) {
                                 WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
                         }
                 }