Dne torek, 12. september 2023 ob 01:49:13 CEST je Kuninori Morimoto
napisal(a):
> ASoC is now unified asoc_xxx() into snd_soc_xxx().
> This patch convert asoc_xxx() to snd_soc_xxx().
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Acked-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
Best regards,
Jernej
> ---
> sound/soc/sunxi/sun4i-codec.c | 12 ++++++------
> sound/soc/sunxi/sun4i-spdif.c | 4 ++--
> sound/soc/sunxi/sun50i-dmic.c | 2 +-
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
> index f0a5fd9011018..ad6336cefaea4 100644
> --- a/sound/soc/sunxi/sun4i-codec.c
> +++ b/sound/soc/sunxi/sun4i-codec.c
> @@ -282,7 +282,7 @@ static void sun4i_codec_stop_capture(struct sun4i_codec
> *scodec) static int sun4i_codec_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 sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
>
> switch (cmd) {
> @@ -314,7 +314,7 @@ static int sun4i_codec_trigger(struct snd_pcm_substream
> *substream, int cmd, static int sun4i_codec_prepare_capture(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 sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
>
>
> @@ -355,7 +355,7 @@ static int sun4i_codec_prepare_capture(struct
> snd_pcm_substream *substream, static int
> sun4i_codec_prepare_playback(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 sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
> u32 val;
>
> @@ -556,7 +556,7 @@ static int sun4i_codec_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 sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
> unsigned long clk_freq;
> int ret, hwrate;
> @@ -597,7 +597,7 @@ static struct snd_pcm_hw_constraint_list
> sun4i_codec_constraints = { static int sun4i_codec_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 sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
>
> snd_pcm_hw_constraint_list(substream->runtime, 0,
> @@ -616,7 +616,7 @@ static int sun4i_codec_startup(struct snd_pcm_substream
> *substream, static void sun4i_codec_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 sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
>
> clk_disable_unprepare(scodec->clk_module);
> diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c
> index b849bb7cf58e2..199cfee41d319 100644
> --- a/sound/soc/sunxi/sun4i-spdif.c
> +++ b/sound/soc/sunxi/sun4i-spdif.c
> @@ -246,8 +246,8 @@ static void sun4i_snd_txctrl_off(struct
> snd_pcm_substream *substream, static int sun4i_spdif_startup(struct
> snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai)
> {
> - struct snd_soc_pcm_runtime *rtd =
asoc_substream_to_rtd(substream);
> - struct sun4i_spdif_dev *host =
> snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct
> snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); +
struct
> sun4i_spdif_dev *host = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd,
> 0));
>
> if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
> return -EINVAL;
> diff --git a/sound/soc/sunxi/sun50i-dmic.c b/sound/soc/sunxi/sun50i-dmic.c
> index 2599683a582dc..3f6fdab75b5fc 100644
> --- a/sound/soc/sunxi/sun50i-dmic.c
> +++ b/sound/soc/sunxi/sun50i-dmic.c
> @@ -75,7 +75,7 @@ static int sun50i_dmic_startup(struct snd_pcm_substream
> *substream, struct snd_soc_dai *cpu_dai)
> {
> struct snd_soc_pcm_runtime *rtd = substream->private_data;
> - struct sun50i_dmic_dev *host =
> snd_soc_dai_get_drvdata(asoc_rtd_to_cpu(rtd, 0)); + struct
sun50i_dmic_dev
> *host = snd_soc_dai_get_drvdata(snd_soc_rtd_to_cpu(rtd, 0));
>
> /* only support capture */
> if (substream->stream != SNDRV_PCM_STREAM_CAPTURE)
