]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
checkpatch: special-case cacheline group macros
authorMichael S. Tsirkin <mst@redhat.com>
Mon, 5 Jan 2026 21:05:42 +0000 (16:05 -0500)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 28 Jan 2026 20:32:16 +0000 (15:32 -0500)
Currently, cacheline group macros trigger checkpatch warnings.
For example:

  $ ./scripts/checkpatch.pl -g ba7e025a6c84aed012421468d83639e5dae982b0
  WARNING: Missing a blank line after declarations
  #58: FILE: drivers/gpio/gpio-virtio.c:32:
  + struct virtio_gpio_response res;
  + __dma_from_device_group_end();

  $ ./scripts/checkpatch.pl -g 5d4cc87414c5d11345c4b11d61377d351b5c28a2
  WARNING: Missing a blank line after declarations
  #267: FILE: include/net/sock.h:431:
  + int sk_rcvlowat;
  + __cacheline_group_end(sock_read_rx);

But these are not actually statements - the following macros
all expand to zero-length fields:
  __cacheline_group_begin()
  __cacheline_group_end()
  __cacheline_group_begin_aligned()
  __cacheline_group_end_aligned()
  __dma_from_device_group_begin()
  __dma_from_device_group_end()

Add them to $declaration_macros so checkpatch recognizes this fact.

Message-ID: <b345bb7e2d4e23672e3e5d1b283754dc11c7d8cd.1767647872.git.mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
scripts/checkpatch.pl

index c0250244cf7a3cb5e289b04fa4a9f644692dc278..f71dd9cbddfb848837d92d5aa71b826edd2cb097 100755 (executable)
@@ -1100,7 +1100,9 @@ our $declaration_macros = 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*\(|
-       (?:$Storage\s+)?(?:XA_STATE|XA_STATE_ORDER)\s*\(
+       (?:$Storage\s+)?(?:XA_STATE|XA_STATE_ORDER)\s*\(|
+       __cacheline_group_(?:begin|end)(?:_aligned)?\s*\(|
+       __dma_from_device_group_(?:begin|end)\s*\(
 )};
 
 our %allow_repeated_words = (