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

ASoC: mediatek: convert not to use asoc_xxx() 



ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

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


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

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

+11 −11
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ 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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_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;

	int memif_num = snd_soc_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;
@@ -98,9 +98,9 @@ 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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_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];

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

	int irq_id;



	irq_id = memif->irq_usage;
@@ -120,9 +120,9 @@ 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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_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 id = snd_soc_rtd_to_cpu(rtd, 0)->id;

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

	int ret;

	unsigned int channels = params_channels(params);
@@ -196,10 +196,10 @@ 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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_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;

	int id = snd_soc_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;
@@ -263,9 +263,9 @@ 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  = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd  = snd_soc_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 id = snd_soc_rtd_to_cpu(rtd, 0)->id;

	int pbuf_size;



	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
@@ -523,7 +523,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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_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

+2 −2
Original line number Diff line number Diff line
@@ -80,9 +80,9 @@ 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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_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];

	struct mtk_base_afe_memif *memif = &afe->memif[snd_soc_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

+2 −2
Original line number Diff line number Diff line
@@ -494,10 +494,10 @@ 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 = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int fs;



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

	if (snd_soc_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

+3 −3
Original line number Diff line number Diff line
@@ -127,9 +127,9 @@ 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 = 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);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	struct snd_soc_dai *codec_dai = snd_soc_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

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 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 = 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);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

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

	struct snd_soc_dai *cpu_dai = snd_soc_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;