aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra/tegra_wm8903.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2014-07-17 16:01:06 -0400
committerMark Brown <broonie@linaro.org>2014-07-22 18:15:57 -0400
commit093c4e5c3cc6dd320f6cfec54c5490d1567fb05c (patch)
tree472a3231af1778d34ed2dd93b72a8eecf6724981 /sound/soc/tegra/tegra_wm8903.c
parent9898e1ccf5af70ad2d03d5b77c591fb243c0f021 (diff)
ASoC: tegra: Replace instances of rtd->codec->card with rtd->card
No need to go via the CODEC to get a pointer to the card. This will help to eventually remove the card field from the snd_soc_codec struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
-rw-r--r--sound/soc/tegra/tegra_wm8903.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 0939661df60b..86e05e938585 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -60,8 +60,7 @@ static int tegra_wm8903_hw_params(struct snd_pcm_substream *substream,
60{ 60{
61 struct snd_soc_pcm_runtime *rtd = substream->private_data; 61 struct snd_soc_pcm_runtime *rtd = substream->private_data;
62 struct snd_soc_dai *codec_dai = rtd->codec_dai; 62 struct snd_soc_dai *codec_dai = rtd->codec_dai;
63 struct snd_soc_codec *codec = codec_dai->codec; 63 struct snd_soc_card *card = rtd->card;
64 struct snd_soc_card *card = codec->card;
65 struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); 64 struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
66 int srate, mclk; 65 int srate, mclk;
67 int err; 66 int err;
@@ -173,7 +172,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
173 struct snd_soc_dai *codec_dai = rtd->codec_dai; 172 struct snd_soc_dai *codec_dai = rtd->codec_dai;
174 struct snd_soc_codec *codec = codec_dai->codec; 173 struct snd_soc_codec *codec = codec_dai->codec;
175 struct snd_soc_dapm_context *dapm = &codec->dapm; 174 struct snd_soc_dapm_context *dapm = &codec->dapm;
176 struct snd_soc_card *card = codec->card; 175 struct snd_soc_card *card = rtd->card;
177 struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); 176 struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
178 177
179 if (gpio_is_valid(machine->gpio_hp_det)) { 178 if (gpio_is_valid(machine->gpio_hp_det)) {