diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2014-03-13 21:24:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-18 13:47:49 +0100 |
| commit | ab64246cf8c31f70a390dcabd134097c3aec45ab (patch) | |
| tree | 5b339a01f4a9e50b3547c3fd64dd66c3680d2127 /sound/soc/codecs/tlv320aic31xx.c | |
| parent | ASoC: tlv320aic31xx: Don't call kfree for memory allocated by devm_kzalloc (diff) | |
| download | linux-ab64246cf8c31f70a390dcabd134097c3aec45ab.tar.xz linux-ab64246cf8c31f70a390dcabd134097c3aec45ab.zip | |
ASoC: codecs: Replace instances of rtd->codec with dai->codec
With CODEC to CODEC links rtd->codec does not necessarily point to the driver's
CODEC. CODEC drivers should always use dai->codec and never even look at the PCM
runtime.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/tlv320aic31xx.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic31xx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index e463ae7fe1f4..fa158cfe9b32 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -753,10 +753,9 @@ static int aic31xx_setup_pll(struct snd_soc_codec *codec, static int aic31xx_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, - struct snd_soc_dai *tmp) + struct snd_soc_dai *dai) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->codec; + struct snd_soc_codec *codec = dai->codec; u8 data = 0; dev_dbg(codec->dev, "## %s: format %d width %d rate %d\n", |