From nobody Wed Apr 29 02:00:57 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18BFEC433EF for ; Wed, 25 May 2022 19:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343988AbiEYTDn (ORCPT ); Wed, 25 May 2022 15:03:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343925AbiEYTDW (ORCPT ); Wed, 25 May 2022 15:03:22 -0400 Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AA0CDFA9 for ; Wed, 25 May 2022 12:03:20 -0700 (PDT) Received: from omf12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 1E75F34D37; Wed, 25 May 2022 19:03:19 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: joe@perches.com) by omf12.hostedemail.com (Postfix) with ESMTPA id 0FE9D1D; Wed, 25 May 2022 19:03:17 +0000 (UTC) Message-ID: <144314f4bf2c58cf2336028a75a5127e848abd81.camel@perches.com> Subject: [PATCH] checkpatch: Add XA_STATE and XA_STATE_ORDER to the macro declaration list From: Joe Perches To: David Howells , Andy Whitcroft , Andrew Morton Cc: willy@infradead.org, linux-kernel@vger.kernel.org Date: Wed, 25 May 2022 12:03:17 -0700 In-Reply-To: <1962595.1653473587@warthog.procyon.org.uk> References: <1962595.1653473587@warthog.procyon.org.uk> User-Agent: Evolution 3.40.4-1ubuntu2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Stat-Signature: x5en8dpcogjisiqsxirn5izb6um4kyfw X-Rspamd-Server: rspamout08 X-Rspamd-Queue-Id: 0FE9D1D X-Session-Marker: 6A6F6540706572636865732E636F6D X-Session-ID: U2FsdGVkX19ehd0L3iazLMVQ/AXmpZNjBz2Cv8kaIsk= X-HE-Tag: 1653505397-979089 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" XA_STATE() and XA_STATE_ORDER macro uses are declarations. Add them to the declaration macro list to avoid suggesting a blank line after declarations when used. Reported-by: David Howells Signed-off-by: Joe Perches --- scripts/checkpatch.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 503e8abbb2c1e..2cf28014132f6 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1042,7 +1042,8 @@ our $FuncArg =3D qr{$Typecast{0,1}($LvalOrFunc|$Const= ant|$String)}; our $declaration_macros =3D qr{(?x: (?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+)= {1,6}\s*\(| (?:$Storage\s+)?[HLP]?LIST_HEAD\s*\(| - (?:SKCIPHER_REQUEST|SHASH_DESC|AHASH_REQUEST)_ON_STACK\s*\( + (?:SKCIPHER_REQUEST|SHASH_DESC|AHASH_REQUEST)_ON_STACK\s*\(| + (?:$Storage\s+)?(?:XA_STATE|XA_STATE_ORDER)\s*\( )}; =20 our %allow_repeated_words =3D (