Commit 74bc5f69 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

checkpatch: special-case cacheline group macros 



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 5d4cc874
  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: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 1a266b6d

scripts/checkpatch.pl

+3 −1
Original line number Diff line number Diff line
@@ -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 = (