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

Commit ab64246c authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent dac7e404

sound/soc/codecs/isabelle.c

+1 −2
Original line number Diff line number Diff line
@@ -910,8 +910,7 @@ static int isabelle_hw_params(struct snd_pcm_substream *substream, 
			      struct snd_pcm_hw_params *params,

			      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;

	u16 aif = 0;

	unsigned int fs_val = 0;

sound/soc/codecs/mc13783.c

+2 −4
Original line number Diff line number Diff line
@@ -106,8 +106,7 @@ static int mc13783_pcm_hw_params_dac(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *params,

				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;

	unsigned int rate = params_rate(params);

	int i;
@@ -126,8 +125,7 @@ static int mc13783_pcm_hw_params_codec(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *params,

				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;

	unsigned int rate = params_rate(params);

	unsigned int val;

sound/soc/codecs/rt5640.c

+1 −2
Original line number Diff line number Diff line
@@ -1601,8 +1601,7 @@ static int get_clk_info(int sclk, int rate) 
static int rt5640_hw_params(struct snd_pcm_substream *substream,

	struct snd_pcm_hw_params *params, 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;

	struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec);

	unsigned int val_len = 0, val_clk, mask_clk;

	int dai_sel, pre_div, bclk_ms, frame_size;

sound/soc/codecs/sta529.c

+1 −2
Original line number Diff line number Diff line
@@ -193,8 +193,7 @@ static int sta529_hw_params(struct snd_pcm_substream *substream, 
		struct snd_pcm_hw_params *params,

		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;

	int pdata, play_freq_val, record_freq_val;

	int bclk_to_fs_ratio;

sound/soc/codecs/tlv320aic31xx.c

+2 −3
Original line number Diff line number Diff line
@@ -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",