diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-12-05 04:24:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-05 12:44:23 +0000 |
| commit | 96e1b9eef4e53a1fea2b889881ca293d153fe0d1 (patch) | |
| tree | 857fbb5c8bd46ed20cb16b19b6848970ff165bbb | |
| parent | 5f6d1df8ced6bb52453149f96d9b7005058641b6 (diff) | |
| download | linux-stable-96e1b9eef4e53a1fea2b889881ca293d153fe0d1.tar.gz linux-stable-96e1b9eef4e53a1fea2b889881ca293d153fe0d1.tar.bz2 linux-stable-96e1b9eef4e53a1fea2b889881ca293d153fe0d1.zip | |
ASoC: don't use rtd->codec on qcom/apq8016_sbc
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>
| -rw-r--r-- | sound/soc/qcom/apq8016_sbc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/qcom/apq8016_sbc.c b/sound/soc/qcom/apq8016_sbc.c index 03851fedd1e2..704428735e3c 100644 --- a/sound/soc/qcom/apq8016_sbc.c +++ b/sound/soc/qcom/apq8016_sbc.c @@ -43,7 +43,7 @@ struct apq8016_sbc_data { static int apq8016_sbc_dai_init(struct snd_soc_pcm_runtime *rtd) { 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_card *card = rtd->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++) { struct snd_soc_dai *dai = rtd->codec_dais[i]; - codec = dai->codec; + component = dai->component; /* 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); if (rval != 0 && rval != -ENOTSUPP) { dev_warn(card->dev, "Failed to set mclk: %d\n", 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) { dev_warn(card->dev, "Failed to set jack: %d\n", rval); return rval; |