Commit 1dc05a27 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

device property: Replace custom implementation of COUNT_ARGS() 



Replace custom and non-portable implementation of COUNT_ARGS().

Fixes: e64b674b ("software node: implement reference properties")
Reported-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Closes: https://lore.kernel.org/r/ZQoILN6QCjzosCOs@google.com


Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Closes: https://github.com/ClangBuiltLinux/linux/issues/1935


Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Link: https://lore.kernel.org/r/20230920153819.2069869-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 98ad1dd0

include/linux/property.h

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#ifndef _LINUX_PROPERTY_H_

#define _LINUX_PROPERTY_H_



#include <linux/args.h>

#include <linux/bits.h>

#include <linux/fwnode.h>

#include <linux/stddef.h>
@@ -288,7 +289,7 @@ struct software_node_ref_args { 
#define SOFTWARE_NODE_REFERENCE(_ref_, ...)			\

(const struct software_node_ref_args) {				\

	.node = _ref_,						\

	.nargs = ARRAY_SIZE(((u64[]){ 0, ##__VA_ARGS__ })) - 1,	\

	.nargs = COUNT_ARGS(__VA_ARGS__),			\

	.args = { __VA_ARGS__ },				\

}