Unverified Commit 2842b871 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: ti: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/875zevir3p.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0b25cffb

sound/soc/ti/ams-delta.c

+2 −2
Original line number Diff line number Diff line
@@ -460,14 +460,14 @@ static void ams_delta_shutdown(struct snd_pcm_substream *substream) 


static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct snd_soc_card *card = rtd->card;

	struct snd_soc_dapm_context *dapm = &card->dapm;

	int ret;

	/* Codec is ready, now add/activate board specific controls */



	/* Store a pointer to the codec structure for tty ldisc use */

	cx20442_codec = rtd->codec_dai->component;

	cx20442_codec = asoc_rtd_to_codec(rtd, 0)->component;



	/* Add hook switch - can be used to control the codec from userspace

	 * even if line discipline fails */

sound/soc/ti/davinci-evm.c

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ static int evm_hw_params(struct snd_pcm_substream *substream, 
			 struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	struct snd_soc_card *soc_card = rtd->card;

	int ret = 0;

	unsigned sysclk = ((struct snd_soc_card_drvdata_davinci *)

sound/soc/ti/davinci-vcif.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void davinci_vcif_start(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct davinci_vcif_dev *davinci_vcif_dev =

			snd_soc_dai_get_drvdata(rtd->cpu_dai);

			snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct davinci_vc *davinci_vc = davinci_vcif_dev->davinci_vc;

	u32 w;
@@ -62,7 +62,7 @@ static void davinci_vcif_stop(struct snd_pcm_substream *substream) 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct davinci_vcif_dev *davinci_vcif_dev =

			snd_soc_dai_get_drvdata(rtd->cpu_dai);

			snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0));

	struct davinci_vc *davinci_vc = davinci_vcif_dev->davinci_vc;

	u32 w;

sound/soc/ti/n810.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int n810_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	int err;



	/* Set the codec system clock for DAC and ADC */

sound/soc/ti/omap-abe-twl6040.c

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int omap_abe_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *codec_dai = rtd->codec_dai;

	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);

	struct snd_soc_card *card = rtd->card;

	struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);

	int clk_id, freq;
@@ -78,7 +78,7 @@ static int omap_abe_dmic_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);

	int ret = 0;



	ret = snd_soc_dai_set_sysclk(cpu_dai, OMAP_DMIC_SYSCLK_PAD_CLKS,
@@ -166,7 +166,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_component *component = rtd->codec_dai->component;

	struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;

	struct snd_soc_card *card = rtd->card;

	struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card);

	int hs_trim;