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

ASoC: mediatek: 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/87o8snir6s.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/mediatek/common/mtk-afe-fe-dai.c

+5 −5
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ int mtk_afe_fe_startup(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	struct snd_pcm_runtime *runtime = substream->runtime;

	int memif_num = rtd->cpu_dai->id;

	int memif_num = asoc_rtd_to_cpu(rtd, 0)->id;

	struct mtk_base_afe_memif *memif = &afe->memif[memif_num];

	const struct snd_pcm_hardware *mtk_afe_hardware = afe->mtk_afe_hardware;

	int ret;
@@ -100,7 +100,7 @@ void mtk_afe_fe_shutdown(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];

	struct mtk_base_afe_memif *memif = &afe->memif[asoc_rtd_to_cpu(rtd, 0)->id];

	int irq_id;



	irq_id = memif->irq_usage;
@@ -122,7 +122,7 @@ int mtk_afe_fe_hw_params(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = rtd->cpu_dai->id;

	int id = asoc_rtd_to_cpu(rtd, 0)->id;

	struct mtk_base_afe_memif *memif = &afe->memif[id];

	int ret;

	unsigned int channels = params_channels(params);
@@ -199,7 +199,7 @@ int mtk_afe_fe_trigger(struct snd_pcm_substream *substream, int cmd, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_pcm_runtime * const runtime = substream->runtime;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = rtd->cpu_dai->id;

	int id = asoc_rtd_to_cpu(rtd, 0)->id;

	struct mtk_base_afe_memif *memif = &afe->memif[id];

	struct mtk_base_afe_irq *irqs = &afe->irqs[memif->irq_usage];

	const struct mtk_base_irq_data *irq_data = irqs->irq_data;
@@ -265,7 +265,7 @@ int mtk_afe_fe_prepare(struct snd_pcm_substream *substream, 
{

	struct snd_soc_pcm_runtime *rtd  = substream->private_data;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = rtd->cpu_dai->id;

	int id = asoc_rtd_to_cpu(rtd, 0)->id;

	int pbuf_size;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {

sound/soc/mediatek/common/mtk-afe-platform-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component, 
{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);

	struct mtk_base_afe_memif *memif = &afe->memif[rtd->cpu_dai->id];

	struct mtk_base_afe_memif *memif = &afe->memif[asoc_rtd_to_cpu(rtd, 0)->id];

	const struct mtk_base_memif_data *memif_data = memif->data;

	struct regmap *regmap = afe->regmap;

	struct device *dev = afe->dev;

sound/soc/mediatek/mt2701/mt2701-afe-pcm.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int mt2701_memif_fs(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	int fs;



	if (rtd->cpu_dai->id != MT2701_MEMIF_ULBT)

	if (asoc_rtd_to_cpu(rtd, 0)->id != MT2701_MEMIF_ULBT)

		fs = mt2701_afe_i2s_fs(rate);

	else

		fs = (rate == 16000 ? 1 : 0);

sound/soc/mediatek/mt2701/mt2701-cs42448.c

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ static int mt2701_cs42448_be_ops_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 *codec_dai = rtd->codec_dai;

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

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

	unsigned int mclk_rate;

	unsigned int rate = params_rate(params);

	unsigned int div_mclk_over_bck = rate > 192000 ? 2 : 4;

sound/soc/mediatek/mt2701/mt2701-wm8960.c

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ static int mt2701_wm8960_be_ops_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);

	unsigned int mclk_rate;

	unsigned int rate = params_rate(params);

	unsigned int div_mclk_over_bck = rate > 192000 ? 2 : 4;

CRA Git | Maintained and supported by SUSTech CRA and CCSE