Commit e6968a17 authored by Mark Brown's avatar Mark Brown
Browse files

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fc9a30e8

sound/soc/codecs/ac97.c

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 
static int ac97_prepare(struct snd_pcm_substream *substream,

			struct snd_soc_dai *dai)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = dai->codec;



	int reg = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?

		  AC97_PCM_FRONT_DAC_RATE : AC97_PCM_LR_ADC_RATE;

sound/soc/codecs/ad1836.c

+1 −3
Original line number Diff line number Diff line
@@ -162,9 +162,7 @@ static int ad1836_hw_params(struct snd_pcm_substream *substream, 
		struct snd_soc_dai *dai)

{

	int word_len = 0;



	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = dai->codec;



	/* bit size */

	switch (params_format(params)) {

sound/soc/codecs/ad193x.c

+1 −3
Original line number Diff line number Diff line
@@ -245,9 +245,7 @@ static int ad193x_hw_params(struct snd_pcm_substream *substream, 
		struct snd_soc_dai *dai)

{

	int word_len = 0, master_rate = 0;



	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_codec *codec = dai->codec;

	struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);



	/* bit size */

sound/soc/codecs/adau1701.c

+1 −2
Original line number Diff line number Diff line
@@ -258,8 +258,7 @@ static int adau1701_set_playback_pcm_format(struct snd_soc_codec *codec, 
static int adau1701_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;

	snd_pcm_format_t format;

	unsigned int val;

sound/soc/codecs/ak4104.c

+1 −2
Original line number Diff line number Diff line
@@ -88,8 +88,7 @@ static int ak4104_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 val = 0;



	/* set the IEC958 bits: consumer mode, no copyright bit */

CRA Git | Maintained and supported by SUSTech CRA and CCSE