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

ASoC: mediatek: use asoc_substream_to_rtd() 



Now we can use asoc_substream_to_rtd() macro,
let's use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87d04r0yth.wl-kuninori.morimoto.gx@renesas.com


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

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

+6 −6
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int mtk_regmap_write(struct regmap *map, int reg, unsigned int val) 
int mtk_afe_fe_startup(struct snd_pcm_substream *substream,

		       struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	struct snd_pcm_runtime *runtime = substream->runtime;

	int memif_num = asoc_rtd_to_cpu(rtd, 0)->id;
@@ -98,7 +98,7 @@ EXPORT_SYMBOL_GPL(mtk_afe_fe_startup); 
void mtk_afe_fe_shutdown(struct snd_pcm_substream *substream,

			 struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

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

	int irq_id;
@@ -120,7 +120,7 @@ int mtk_afe_fe_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_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

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

	struct mtk_base_afe_memif *memif = &afe->memif[id];
@@ -196,7 +196,7 @@ EXPORT_SYMBOL_GPL(mtk_afe_fe_hw_free); 
int mtk_afe_fe_trigger(struct snd_pcm_substream *substream, int cmd,

		       struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_pcm_runtime * const runtime = substream->runtime;

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

	int id = asoc_rtd_to_cpu(rtd, 0)->id;
@@ -263,7 +263,7 @@ EXPORT_SYMBOL_GPL(mtk_afe_fe_trigger); 
int mtk_afe_fe_prepare(struct snd_pcm_substream *substream,

		       struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd  = substream->private_data;

	struct snd_soc_pcm_runtime *rtd  = asoc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_dai_get_drvdata(dai);

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

	int pbuf_size;
@@ -505,7 +505,7 @@ EXPORT_SYMBOL_GPL(mtk_memif_set_rate); 
int mtk_memif_set_rate_substream(struct snd_pcm_substream *substream,

				 int id, unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_component *component =

		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);

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

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ EXPORT_SYMBOL_GPL(mtk_afe_add_sub_dai_control); 
snd_pcm_uframes_t mtk_afe_pcm_pointer(struct snd_soc_component *component,

				      struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(component);

	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;

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

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int mt2701_dlm_fe_trigger(struct snd_pcm_substream *substream, 
static int mt2701_memif_fs(struct snd_pcm_substream *substream,

			   unsigned int rate)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	int fs;



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

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

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static const struct snd_soc_ops mt2701_cs42448_48k_fe_ops = { 
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_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	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;

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

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static const struct snd_kcontrol_new mt2701_wm8960_controls[] = { 
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_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE