From 2a40c7dbffb69bbbdab08d65801fe84050e610e6 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Thu, 27 Jul 2023 01:52:33 +0100 Subject: [PATCH] v6.4: switch to use c2c_params instead of params commit 99fddc1618ff64cc71bd51dbf83bd13e74778fe0 Merge: 72456c24c8357 1ea63f29c2771 Author: Mark Brown Date: Wed Apr 5 16:35:09 2023 +0100 ASoC: clarify Codec2Codec params Merge series from Kuninori Morimoto : ASoC is supporting Codec2Codec, but its parameter name is "params" and "num_params" which are very unclear naming. This patch-set clarifies it by replacing to c2c_params / num_c2c_params. commit 1ea63f29c27712d6b9c45af67cd71299d849c5e3 Author: Kuninori Morimoto Date: Sun Apr 2 23:00:17 2023 +0000 ASoC: soc.h: remove unused params/num_params No drivers are using params/num_params any more. Let's remove these. Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87iledc2ke.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown commit e7a73b05542d82e209af450dd90b730255f6e775 Author: Kuninori Morimoto Date: Sun Apr 2 23:00:07 2023 +0000 ASoC: samsung: switch to use c2c_params instead of params ASoC is now using c2c_params instead of params. This patch replace it. num_c2c_params (was num_params) was not mandatory before, but let's set it by this patch. Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87jzytc2kp.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown commit 433f4a1697fae78c34377de1ef3abd26aec8214e Author: Kuninori Morimoto Date: Sun Apr 2 22:59:57 2023 +0000 ASoC: meson: switch to use c2c_params instead of params ASoC is now using c2c_params instead of params. This patch replace it. num_c2c_params (was num_params) was not mandatory before, but let's set it by this patch. Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87lej9c2ky.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown commit 7ddc7f91beb285246e926e3adf0b292b071aea33 Author: Kuninori Morimoto Date: Sun Apr 2 22:59:35 2023 +0000 ASoC: soc.h: clarify Codec2Codec params snd_soc_dai_link has params/num_params, but it is unclear that params for what. This patch clarify it is params for Codec2Codec. Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87o7o5c2lk.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- seeed-voicecard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seeed-voicecard.c b/seeed-voicecard.c index 935f997..10ac1cd 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -396,8 +396,8 @@ static int asoc_simple_init_dai_link_params(struct snd_soc_pcm_runtime *rtd) params->channels_min = hw.channels_min; params->channels_max = hw.channels_max; - dai_link->params = params; - dai_link->num_params = 1; + dai_link->c2c_params = params; + dai_link->num_c2c_params = 1; return 0; }