aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/da7210.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-04 10:58:16 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-04 10:59:12 -0400
commite6968a1719a88afa4708ff43696d6615f0be90be (patch)
tree9255c90aa7617da716d56d00d116bab7da2b3da7 /sound/soc/codecs/da7210.c
parentfc9a30e85e4a9df7e692eda45b8484fc028238f0 (diff)
ASoC: codecs: Remove rtd->codec usage from CODEC drivers
In order to support CODEC<->CODEC links remove the assumption that there is only a single CODEC on a DAI link by removing the use of the CODEC pointer in the rtd from the CODEC drivers. They are already being passed their DAI whenever they are passed an rtd and can get the CODEC from there. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/da7210.c')
-rw-r--r--sound/soc/codecs/da7210.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 8e45aa9cb7b7..5dfdf6e7a39a 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -716,8 +716,7 @@ static int da7210_hw_params(struct snd_pcm_substream *substream,
716 struct snd_pcm_hw_params *params, 716 struct snd_pcm_hw_params *params,
717 struct snd_soc_dai *dai) 717 struct snd_soc_dai *dai)
718{ 718{
719 struct snd_soc_pcm_runtime *rtd = substream->private_data; 719 struct snd_soc_codec *codec = dai->codec;
720 struct snd_soc_codec *codec = rtd->codec;
721 u32 dai_cfg1; 720 u32 dai_cfg1;
722 u32 fs, bypass; 721 u32 fs, bypass;
723 722