Commit 22302af28d3f ("cleanup: Annotate guard constructors with nonnull") added the macro __nonnull_args() to wrap raw compiler attribute. Replace __attribute__((nonnull)) with __nonnull_args() to standardize nonnull attribute usage across the tree and keep the attribute's quirks in one place rather than open-coded at every call site. Add spaces after the commas in the __nonnull_args() argument list to follow the usual coding style (according to checkpatch). Suggested-by: Miguel Ojeda Signed-off-by: Dmitry Ilvokhin --- include/linux/list_sort.h | 4 ++-- lib/list_sort.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/list_sort.h b/include/linux/list_sort.h index 453105f74e05..48a91ef0d751 100644 --- a/include/linux/list_sort.h +++ b/include/linux/list_sort.h @@ -6,9 +6,9 @@ struct list_head; -typedef int __attribute__((nonnull(2,3))) (*list_cmp_func_t)(void *, +typedef int __nonnull_args(2, 3) (*list_cmp_func_t)(void *, const struct list_head *, const struct list_head *); -__attribute__((nonnull(2,3))) +__nonnull_args(2, 3) void list_sort(void *priv, struct list_head *head, list_cmp_func_t cmp); #endif diff --git a/lib/list_sort.c b/lib/list_sort.c index ff99203f208f..da34c46cf5d8 100644 --- a/lib/list_sort.c +++ b/lib/list_sort.c @@ -9,7 +9,7 @@ * to chaining of merge() calls: null-terminated, no reserved or * sentinel head node, "prev" links not maintained. */ -__attribute__((nonnull(2,3,4))) +__nonnull_args(2, 3, 4) static struct list_head *merge(void *priv, list_cmp_func_t cmp, struct list_head *a, struct list_head *b) { @@ -45,7 +45,7 @@ static struct list_head *merge(void *priv, list_cmp_func_t cmp, * prev-link restoration pass, or maintaining the prev links * throughout. */ -__attribute__((nonnull(2,3,4,5))) +__nonnull_args(2, 3, 4, 5) static void merge_final(void *priv, list_cmp_func_t cmp, struct list_head *head, struct list_head *a, struct list_head *b) { @@ -175,7 +175,7 @@ static void merge_final(void *priv, list_cmp_func_t cmp, struct list_head *head, * of size 2^k varies from 2^(k-1) (cases 3 and 5 when x == 0) to * 2^(k+1) - 1 (second merge of case 5 when x == 2^(k-1) - 1). */ -__attribute__((nonnull(2,3))) +__nonnull_args(2, 3) void list_sort(void *priv, struct list_head *head, list_cmp_func_t cmp) { struct list_head *list = head->next, *pending = NULL; -- 2.53.0-Meta