diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-05-19 09:41:46 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-20 21:54:54 (GMT) |
| commit | 0596f70069bb5ab34eea980c14fad1041f2abae5 (patch) | |
| tree | 66f75e16ed4bb434d1c059dba58795fed4a2feb2 /sound/soc/omap/omap-abe-twl6040.c | |
| parent | b7a80379aa52d033d2a7c2390c8e80bd027758bf (diff) | |
| download | linux-0596f70069bb5ab34eea980c14fad1041f2abae5.tar.xz | |
ASoC: omap: 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>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/omap/omap-abe-twl6040.c')
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 1a89e5b..cec836e 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -47,8 +47,7 @@ static int omap_abe_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_card *card = codec->card; + struct snd_soc_card *card = rtd->card; struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); int clk_id, freq; int ret; @@ -168,7 +167,7 @@ static const struct snd_soc_dapm_route audio_map[] = { static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_card *card = codec->card; + struct snd_soc_card *card = rtd->card; struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); int hs_trim; int ret = 0; |