diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl
index b3a085483..4eb50c3cb 100755
--- a/tools/scripts/checkpatch.pl
+++ b/tools/scripts/checkpatch.pl
@@ -1635,8 +1635,10 @@ sub process {
 		    $rawline =~ /\b59\s+Temple\s+Pl/i ||
 		    $rawline =~ /\b51\s+Franklin\s+St/i) {
 			my $herevet = "$here\n" . cat_vet($rawline) . "\n";
-			my $msg_type = \&ERROR;
-			ERROR("Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
+			ERROR("FSF_MAILING_ADDRESS",
+			      "Do not include the paragraph about writing to the Free Software Foundation's mailing address " .
+			      "from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. " .
+			      "OpenOCD already includes a copy of the GPL.\n" . $herevet)
 		}
 
 # check for Kconfig help text having a real description