ASoC: Fix outdated API usage in tlv320aic32x4
Subsystems (3)
PATCH 1/2 ASoC: Fix outdated API usage in tlv320aic32x4
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/tlv320aic32x4.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/tlv320aic32x4.c +5 -5
@@ -340,13 +340,13 @@ static inline int aic32x4_get_divs(int mclk, int rate)static int aic32x4_add_widgets (struct snd_soc_codec *codec) { -snd_soc_dapm_new_controls (codec, aic32x4_dapm_widgets, -ARRAY_SIZE (aic32x4_dapm_widgets)); +snd_soc_dapm_new_controls (&codec->dapm, aic32x4_dapm_widgets, +ARRAY_SIZE (aic32x4_dapm_widgets)); -snd_soc_dapm_add_routes (codec, aic32x4_dapm_routes, +snd_soc_dapm_add_routes (&codec->dapm, aic32x4_dapm_routes,ARRAY_SIZE (aic32x4_dapm_routes)); -snd_soc_dapm_new_widgets (codec); +snd_soc_dapm_new_widgets (&codec->dapm);return 0 ; }
@@ -602,7 +602,7 @@ static int aic32x4_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_OFF :break ; } - codec->bias_level = level; + codec->dapm.bias_level = level;return 0 ; }
Signature · 1 line
1.7.2.3
PATCH 2/2 ASoC: Add missing debugfs conditionals
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/soc-core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
sound/soc/soc-core.c +2 -0
@@ -1879,6 +1879,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)snd_soc_dapm_add_routes (&card->dapm, card->dapm_routes, card->num_dapm_routes); +#ifdef CONFIG_DEBUG_FS card->dapm.debugfs_dapm =debugfs_create_dir ("dapm" , card->debugfs_card_root);if (!card->dapm.debugfs_dapm)
@@ -1886,6 +1887,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) "Failed to create card DAPM debugfs directory\n");snd_soc_dapm_debugfs_init (&card->dapm); +#endif snprintf (card->snd_card->shortname,sizeof (card->snd_card->shortname),"%s" , card->name);
Signature · 1 line
1.7.2.3
Quoted 5 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/tlv320aic32x4.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
Both
Acked-by Liam Girdwood <[email protected]>