Unverified Commit 99396e38 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: ux500: 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/871rpjir34.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/ux500/mop500_ab8500.c

+3 −3
Original line number Diff line number Diff line
@@ -215,8 +215,8 @@ static int mop500_ab8500_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 device *dev = rtd->card->dev;

	unsigned int fmt;

	int channels, ret = 0, driver_mode, slots;
@@ -339,7 +339,7 @@ static int mop500_ab8500_hw_params(struct snd_pcm_substream *substream, 
static int mop500_ab8500_hw_free(struct snd_pcm_substream *substream)

{

	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);



	mutex_lock(&mop500_ab8500_params_lock);

	__clear_bit(cpu_dai->id, &mop500_ab8500_usage);

sound/soc/ux500/ux500_pcm.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const struct snd_pcm_hardware ux500_pcm_hw = { 
static struct dma_chan *ux500_pcm_request_chan(struct snd_soc_pcm_runtime *rtd,

	struct snd_pcm_substream *substream)

{

	struct snd_soc_dai *dai = rtd->cpu_dai;

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

	u16 per_data_width, mem_data_width;

	struct stedma40_chan_cfg *dma_cfg;

	struct ux500_msp_dma_params *dma_params;
@@ -86,7 +86,7 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream, 
		struct dma_slave_config *slave_config)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct msp_i2s_platform_data *pdata = rtd->cpu_dai->dev->platform_data;

	struct msp_i2s_platform_data *pdata = asoc_rtd_to_cpu(rtd, 0)->dev->platform_data;

	struct snd_dmaengine_dai_dma_data *snd_dma_params;

	struct ux500_msp_dma_params *ste_dma_params;

	dma_addr_t dma_addr;
@@ -94,11 +94,11 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream, 


	if (pdata) {

		ste_dma_params =

			snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

			snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);

		dma_addr = ste_dma_params->tx_rx_addr;

	} else {

		snd_dma_params =

			snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);

			snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);

		dma_addr = snd_dma_params->addr;

	}