Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: don't use rtd->codec on qcom/apq8016_sbc

Browse Source 
rtd->codec will be removed soon.
rtd->codec = rtd->codec_dai->codec, thus,
we can use rtd->codec_dai->component instead of it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2017-12-05 04:24:13 +00:00 committed by Mark Brown
parent 5f6d1df8ce
commit 96e1b9eef4
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/qcom/apq8016_sbc.c
View File

@ -43,7 +43,7 @@ struct apq8016_sbc_data {
static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct snd_soc_dai_link *dai_link = rtd->dai_link; struct snd_soc_dai_link *dai_link = rtd->dai_link;
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct apq8016_sbc_data *pdata = snd_soc_card_get_drvdata(card); struct apq8016_sbc_data *pdata = snd_soc_card_get_drvdata(card);
@ -102,15 +102,15 @@ static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd)
for (i = 0 ; i < dai_link->num_codecs; i++) { for (i = 0 ; i < dai_link->num_codecs; i++) {
struct snd_soc_dai *dai = rtd->codec_dais[i]; struct snd_soc_dai *dai = rtd->codec_dais[i];
codec = dai->codec; component = dai->component;
/* Set default mclk for internal codec */ /* Set default mclk for internal codec */
rval = snd_soc_codec_set_sysclk(codec, 0, 0, DEFAULT_MCLK_RATE, rval = snd_soc_component_set_sysclk(component, 0, 0, DEFAULT_MCLK_RATE,
SND_SOC_CLOCK_IN); SND_SOC_CLOCK_IN);
if (rval != 0 && rval != -ENOTSUPP) { if (rval != 0 && rval != -ENOTSUPP) {
dev_warn(card->dev, "Failed to set mclk: %d\n", rval); dev_warn(card->dev, "Failed to set mclk: %d\n", rval);
return rval; return rval;
} }
rval = snd_soc_codec_set_jack(codec, &pdata->jack, NULL); rval = snd_soc_component_set_jack(component, &pdata->jack, NULL);
if (rval != 0 && rval != -ENOTSUPP) { if (rval != 0 && rval != -ENOTSUPP) {
dev_warn(card->dev, "Failed to set jack: %d\n", rval); dev_warn(card->dev, "Failed to set jack: %d\n", rval);
return rval; return rval;