From 8448ced15015114915f46f5964813582930dfae7 Mon Sep 17 00:00:00 2001 From: Hin-Tak Leung Date: Wed, 21 Feb 2024 05:08:14 +0000 Subject: [PATCH] v6.7: perl -pi -e 's(asoc_rtd_to_)(snd_soc_rtd_to_)g' commit 1d5a2b5dd0a8d2b2b535b5266699429dbd48e62f Author: Kuninori Morimoto Date: Mon Sep 11 23:47:02 2023 +0000 ASoC: soc.h: convert asoc_xxx() to snd_soc_xxx() ASoC is using 2 type of prefix (asoc_xxx() vs snd_soc_xxx()), but there is no particular reason about that [1]. To reduce confusing, standarding these to snd_soc_xxx() is sensible. This patch adds asoc_xxx() macro to keep compatible for a while. It will be removed if all drivers were switched to new style. Link: https://lore.kernel.org/r/87h6td3hus.wl-kuninori.morimoto.gx@renesas.com [1] Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/87fs3ks26i.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- seeed-voicecard.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/seeed-voicecard.c b/seeed-voicecard.c index 8ddf691..dcd0c20 100644 --- a/seeed-voicecard.c +++ b/seeed-voicecard.c @@ -111,16 +111,16 @@ static int seeed_voice_card_startup(struct snd_pcm_substream *substream) if (ret) clk_disable_unprepare(dai_props->cpu_dai.clk); - if (asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min) { - priv->channels_playback_default = asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min; + if (snd_soc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min) { + priv->channels_playback_default = snd_soc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min; } - if (asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min) { - priv->channels_capture_default = asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min; + if (snd_soc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min) { + priv->channels_capture_default = snd_soc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min; } - asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min = priv->channels_playback_override; - asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_max = priv->channels_playback_override; - asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min = priv->channels_capture_override; - asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_max = priv->channels_capture_override; + snd_soc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min = priv->channels_playback_override; + snd_soc_rtd_to_cpu(rtd, 0)->driver->playback.channels_max = priv->channels_playback_override; + snd_soc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min = priv->channels_capture_override; + snd_soc_rtd_to_cpu(rtd, 0)->driver->capture.channels_max = priv->channels_capture_override; return ret; } @@ -132,10 +132,10 @@ static void seeed_voice_card_shutdown(struct snd_pcm_substream *substream) struct seeed_dai_props *dai_props = seeed_priv_to_props(priv, rtd->num); - asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min = priv->channels_playback_default; - asoc_rtd_to_cpu(rtd, 0)->driver->playback.channels_max = priv->channels_playback_default; - asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min = priv->channels_capture_default; - asoc_rtd_to_cpu(rtd, 0)->driver->capture.channels_max = priv->channels_capture_default; + snd_soc_rtd_to_cpu(rtd, 0)->driver->playback.channels_min = priv->channels_playback_default; + snd_soc_rtd_to_cpu(rtd, 0)->driver->playback.channels_max = priv->channels_playback_default; + snd_soc_rtd_to_cpu(rtd, 0)->driver->capture.channels_min = priv->channels_capture_default; + snd_soc_rtd_to_cpu(rtd, 0)->driver->capture.channels_max = priv->channels_capture_default; clk_disable_unprepare(dai_props->cpu_dai.clk); @@ -146,8 +146,8 @@ static int seeed_voice_card_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 = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + 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); struct seeed_card_data *priv = snd_soc_card_get_drvdata(rtd->card); struct seeed_dai_props *dai_props = seeed_priv_to_props(priv, rtd->num); @@ -211,7 +211,7 @@ static void work_cb_codec_clk(struct work_struct *work) static int seeed_voice_card_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *dai = asoc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *dai = snd_soc_rtd_to_codec(rtd, 0); struct seeed_card_data *priv = snd_soc_card_get_drvdata(rtd->card); #if CONFIG_AC10X_TRIG_LOCK unsigned long flags; @@ -412,8 +412,8 @@ static int asoc_simple_init_dai_link_params(struct snd_soc_pcm_runtime *rtd) static int seeed_voice_card_dai_init(struct snd_soc_pcm_runtime *rtd) { struct seeed_card_data *priv = snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_dai *codec = asoc_rtd_to_codec(rtd, 0); - struct snd_soc_dai *cpu = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec = snd_soc_rtd_to_codec(rtd, 0); + struct snd_soc_dai *cpu = snd_soc_rtd_to_cpu(rtd, 0); struct seeed_dai_props *dai_props = seeed_priv_to_props(priv, rtd->num); int ret;