From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
No drivers are using params/num_params any more.
Let's remove these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
include/sound/soc.h | 3 ---
sound/soc/soc-core.c | 11 -----------
2 files changed, 14 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 276afdb1f445..3833184c187f 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -690,9 +690,6 @@ struct snd_soc_dai_link {
const struct snd_soc_pcm_stream *c2c_params;
unsigned int num_c2c_params;
- const struct snd_soc_pcm_stream *params; /* REMOVE ME */
- unsigned int num_params; /* REMOVE ME */
-
unsigned int dai_fmt; /* format to set on init */
enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 04f1bc8a3128..9bbcff492c1e 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2294,9 +2294,6 @@ EXPORT_SYMBOL_GPL(snd_soc_add_dai_controls);
*/
int snd_soc_register_card(struct snd_soc_card *card)
{
- struct snd_soc_dai_link *dai_link;
- int i;
-
if (!card->name || !card->dev)
return -EINVAL;
@@ -2317,14 +2314,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
mutex_init(&card->dapm_mutex);
mutex_init(&card->pcm_mutex);
- /* REMOVE ME */
- for_each_card_prelinks(card, i, dai_link) {
- if (!dai_link->c2c_params) {
- dai_link->c2c_params = dai_link->params;
- dai_link->num_c2c_params = dai_link->num_params;
- }
- }
-
return snd_soc_bind_card(card);
}
EXPORT_SYMBOL_GPL(snd_soc_register_card);
--
2.25.1
