Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40db77a0 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: tegra: remove usage of rtd->codec 



rtd->codec_dai->codec can be used instead.

This is a slight step along the way to not needing the rtd->codec field
any more.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 408dafc4

sound/soc/tegra/tegra_alc5632.c

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static int tegra_alc5632_asoc_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_card *card = codec->card;

	struct tegra_alc5632 *alc5632 = snd_soc_card_get_drvdata(card);

	int srate, mclk;
@@ -105,7 +105,8 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = { 


static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card);

sound/soc/tegra/tegra_wm8753.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static int tegra_wm8753_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_card *card = codec->card;

	struct tegra_wm8753 *machine = snd_soc_card_get_drvdata(card);

	int srate, mclk;

sound/soc/tegra/tegra_wm8903.c

+3 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int tegra_wm8903_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_card *card = codec->card;

	struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);

	int srate, mclk;
@@ -181,7 +181,8 @@ static const struct snd_kcontrol_new tegra_wm8903_controls[] = { 


static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_card *card = codec->card;

	struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);

sound/soc/tegra/trimslice.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int trimslice_asoc_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = codec_dai->codec;

	struct snd_soc_card *card = codec->card;

	struct tegra_trimslice *trimslice = snd_soc_card_get_drvdata(card);

	int srate, mclk;