| Message ID | 20230904111524.1740930-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 428cc4106a430781020eedc68e8d0511380eb0ef |
| Headers | show |
| Series | [v1,1/1] ASoC: soc.h: replace custom COUNT_ARGS() & CONCATENATE() implementations | expand |
Hi > Replace custom implementation of the macros from args.h. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> (snip) > -#define SND_SOC_DAILINK_REGx(_1, _2, _3, func, ...) func > #define SND_SOC_DAILINK_REG(...) \ > - SND_SOC_DAILINK_REGx(__VA_ARGS__, \ > - SND_SOC_DAILINK_REG3, \ > - SND_SOC_DAILINK_REG2, \ > - SND_SOC_DAILINK_REG1)(__VA_ARGS__) > + CONCATENATE(SND_SOC_DAILINK_REG, COUNT_ARGS(__VA_ARGS__))(__VA_ARGS__) Interesting nice macro ! Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Thank you for your help !! Best regards --- Kuninori Morimoto
On Mon, 04 Sep 2023 14:15:24 +0300, Andy Shevchenko wrote: > Replace custom implementation of the macros from args.h. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: soc.h: replace custom COUNT_ARGS() & CONCATENATE() implementations commit: 428cc4106a430781020eedc68e8d0511380eb0ef All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/include/sound/soc.h b/include/sound/soc.h index fa2337a3cf4c..509386ff5212 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -10,6 +10,7 @@ #ifndef __LINUX_SND_SOC_H #define __LINUX_SND_SOC_H +#include <linux/args.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/types.h> @@ -870,12 +871,8 @@ asoc_link_to_platform(struct snd_soc_dai_link *link, int n) { .platforms = platform, \ .num_platforms = ARRAY_SIZE(platform) -#define SND_SOC_DAILINK_REGx(_1, _2, _3, func, ...) func #define SND_SOC_DAILINK_REG(...) \ - SND_SOC_DAILINK_REGx(__VA_ARGS__, \ - SND_SOC_DAILINK_REG3, \ - SND_SOC_DAILINK_REG2, \ - SND_SOC_DAILINK_REG1)(__VA_ARGS__) + CONCATENATE(SND_SOC_DAILINK_REG, COUNT_ARGS(__VA_ARGS__))(__VA_ARGS__) #define SND_SOC_DAILINK_DEF(name, def...) \ static struct snd_soc_dai_link_component name[] = { def }
Replace custom implementation of the macros from args.h. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- include/sound/soc.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)