All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: "\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
	"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
	"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Liam Girdwood" <lgirdwood@gmail.com>,
	"Mark Brown" <broonie@kernel.org>,
	"Nicolas Ferre" <nicolas.ferre@microchip.com>,
	"Takashi Iwai" <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH 18/54] ASoC: atmel: convert not to use asoc_xxx()
Date: Mon, 11 Sep 2023 23:49:01 +0000	[thread overview]
Message-ID: <87r0n4qniq.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87h6o0s275.wl-kuninori.morimoto.gx@renesas.com>

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@renesas.com>
---
 sound/soc/atmel/atmel-classd.c   | 10 +++++-----
 sound/soc/atmel/atmel-pcm-dma.c  |  8 ++++----
 sound/soc/atmel/atmel-pcm-pdc.c  |  4 ++--
 sound/soc/atmel/atmel-pdmic.c    | 12 ++++++------
 sound/soc/atmel/atmel_wm8904.c   |  4 ++--
 sound/soc/atmel/mikroe-proto.c   |  2 +-
 sound/soc/atmel/sam9g20_wm8731.c |  2 +-
 sound/soc/atmel/sam9x5_wm8731.c  |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sound/soc/atmel/atmel-classd.c b/sound/soc/atmel/atmel-classd.c
index 4c1985711218d..6aed1ee443b44 100644
--- a/sound/soc/atmel/atmel-classd.c
+++ b/sound/soc/atmel/atmel-classd.c
@@ -118,7 +118,7 @@ static const struct snd_pcm_hardware atmel_classd_hw = {
 static int atmel_classd_cpu_dai_startup(struct snd_pcm_substream *substream,
 					struct snd_soc_dai *cpu_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 atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
 	int err;
 
@@ -141,7 +141,7 @@ atmel_classd_platform_configure_dma(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params,
 	struct dma_slave_config *slave_config)
 {
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
 	struct atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
 
 	if (params_physical_width(params) != 16) {
@@ -338,7 +338,7 @@ atmel_classd_cpu_dai_hw_params(struct snd_pcm_substream *substream,
 			       struct snd_pcm_hw_params *params,
 			       struct snd_soc_dai *cpu_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 atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
 	struct snd_soc_component *component = cpu_dai->component;
 	int fs;
@@ -381,7 +381,7 @@ static void
 atmel_classd_cpu_dai_shutdown(struct snd_pcm_substream *substream,
 			      struct snd_soc_dai *cpu_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 atmel_classd *dd = snd_soc_card_get_drvdata(rtd->card);
 
 	clk_disable_unprepare(dd->gclk);
@@ -478,7 +478,7 @@ static int atmel_classd_asoc_card_init(struct device *dev,
 		return -ENOMEM;
 
 	dai_link->cpus		= comp;
-	dai_link->codecs	= &asoc_dummy_dlc;
+	dai_link->codecs	= &snd_soc_dummy_dlc;
 
 	dai_link->num_cpus	= 1;
 	dai_link->num_codecs	= 1;
diff --git a/sound/soc/atmel/atmel-pcm-dma.c b/sound/soc/atmel/atmel-pcm-dma.c
index 96a8c7dba98ff..7306e04da513b 100644
--- a/sound/soc/atmel/atmel-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
@@ -52,10 +52,10 @@ static const struct snd_pcm_hardware atmel_pcm_dma_hardware = {
 static void atmel_pcm_dma_irq(u32 ssc_sr,
 	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 atmel_pcm_dma_params *prtd;
 
-	prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
+	prtd = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);
 
 	if (ssc_sr & prtd->mask->ssc_error) {
 		if (snd_pcm_running(substream))
@@ -77,12 +77,12 @@ static void atmel_pcm_dma_irq(u32 ssc_sr,
 static int atmel_pcm_configure_dma(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params, struct dma_slave_config *slave_config)
 {
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
 	struct atmel_pcm_dma_params *prtd;
 	struct ssc_device *ssc;
 	int ret;
 
-	prtd = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
+	prtd = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);
 	ssc = prtd->ssc;
 
 	ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);
diff --git a/sound/soc/atmel/atmel-pcm-pdc.c b/sound/soc/atmel/atmel-pcm-pdc.c
index 3e7ea2021b46b..7db8df85c54f3 100644
--- a/sound/soc/atmel/atmel-pcm-pdc.c
+++ b/sound/soc/atmel/atmel-pcm-pdc.c
@@ -140,12 +140,12 @@ static int atmel_pcm_hw_params(struct snd_soc_component *component,
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
 	struct atmel_runtime_data *prtd = runtime->private_data;
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
 
 	/* this may get called several times by oss emulation
 	 * with different params */
 
-	prtd->params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
+	prtd->params = snd_soc_dai_get_dma_data(snd_soc_rtd_to_cpu(rtd, 0), substream);
 	prtd->params->dma_intr_handler = atmel_pcm_dma_irq;
 
 	prtd->dma_buffer = runtime->dma_addr;
diff --git a/sound/soc/atmel/atmel-pdmic.c b/sound/soc/atmel/atmel-pdmic.c
index 0db7815d230c3..fa29dd8ef2089 100644
--- a/sound/soc/atmel/atmel-pdmic.c
+++ b/sound/soc/atmel/atmel-pdmic.c
@@ -104,7 +104,7 @@ static struct atmel_pdmic_pdata *atmel_pdmic_dt_init(struct device *dev)
 static int atmel_pdmic_cpu_dai_startup(struct snd_pcm_substream *substream,
 					struct snd_soc_dai *cpu_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 atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card);
 	int ret;
 
@@ -132,7 +132,7 @@ static int atmel_pdmic_cpu_dai_startup(struct snd_pcm_substream *substream,
 static void atmel_pdmic_cpu_dai_shutdown(struct snd_pcm_substream *substream,
 					struct snd_soc_dai *cpu_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 atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card);
 
 	/* Disable the overrun error interrupt */
@@ -145,7 +145,7 @@ static void atmel_pdmic_cpu_dai_shutdown(struct snd_pcm_substream *substream,
 static int atmel_pdmic_cpu_dai_prepare(struct snd_pcm_substream *substream,
 					struct snd_soc_dai *cpu_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 atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card);
 	struct snd_soc_component *component = cpu_dai->component;
 	u32 val;
@@ -191,7 +191,7 @@ atmel_pdmic_platform_configure_dma(struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params,
 				struct dma_slave_config *slave_config)
 {
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
 	struct atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card);
 	int ret;
 
@@ -356,7 +356,7 @@ atmel_pdmic_cpu_dai_hw_params(struct snd_pcm_substream *substream,
 			      struct snd_pcm_hw_params *params,
 			      struct snd_soc_dai *cpu_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 atmel_pdmic *dd = snd_soc_card_get_drvdata(rtd->card);
 	struct snd_soc_component *component = cpu_dai->component;
 	unsigned int rate_min = substream->runtime->hw.rate_min;
@@ -501,7 +501,7 @@ static int atmel_pdmic_asoc_card_init(struct device *dev,
 		return -ENOMEM;
 
 	dai_link->cpus		= comp;
-	dai_link->codecs	= &asoc_dummy_dlc;
+	dai_link->codecs	= &snd_soc_dummy_dlc;
 
 	dai_link->num_cpus	= 1;
 	dai_link->num_codecs	= 1;
diff --git a/sound/soc/atmel/atmel_wm8904.c b/sound/soc/atmel/atmel_wm8904.c
index 00e98136bec25..01e944fa11483 100644
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
@@ -26,8 +26,8 @@ static const struct snd_soc_dapm_widget atmel_asoc_wm8904_dapm_widgets[] = {
 static int atmel_asoc_wm8904_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_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	int ret;
 
 	ret = snd_soc_dai_set_pll(codec_dai, WM8904_FLL_MCLK, WM8904_FLL_MCLK,
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index 30c87c2c1b0bd..18a8760443ae6 100644
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -21,7 +21,7 @@
 static int snd_proto_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
-	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 
 	/* Set proto sysclk */
 	int ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 0405e9e49140e..d3ec9826d505f 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c
@@ -66,7 +66,7 @@ static const struct snd_soc_dapm_route intercon[] = {
  */
 static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)
 {
-	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	struct device *dev = rtd->dev;
 	int ret;
 
diff --git a/sound/soc/atmel/sam9x5_wm8731.c b/sound/soc/atmel/sam9x5_wm8731.c
index cd1d59a90e021..d1c1f370a9cd5 100644
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
@@ -40,7 +40,7 @@ struct sam9x5_drvdata {
  */
 static int sam9x5_wm8731_init(struct snd_soc_pcm_runtime *rtd)
 {
-	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
+	struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
 	struct device *dev = rtd->dev;
 	int ret;
 
-- 
2.25.1


  parent reply	other threads:[~2023-09-11 23:52 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-11 23:46 [PATCH 00/54] ASoC: convert asoc_xxx() to snd_soc_xxx() Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 01/54] ASoC: soc.h: " Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 02/54] ASoC: simple_card_utils.h: convert not to use asoc_xxx() Kuninori Morimoto
2023-09-14  9:42   ` Dan Carpenter
2023-09-14 22:59     ` Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 03/54] ASoC: sh: " Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 04/54] ASoC: ti: " Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 05/54] ASoC: arm: " Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 06/54] ASoC: amd: " Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 07/54] ASoC: bcm: " Kuninori Morimoto
2023-09-11 23:47 ` [PATCH 08/54] ASoC: dwc: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 09/54] ASoC: fsl: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 10/54] ASoC: img: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 11/54] ASoC: mxs: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 12/54] ASoC: pxa: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 13/54] ASoC: stm: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 14/54] ASoC: au1x: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 15/54] ASoC: qcom: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 16/54] ASoC: sprd: " Kuninori Morimoto
2023-09-11 23:48 ` [PATCH 17/54] ASoC: apple: " Kuninori Morimoto
2023-09-11 23:49 ` Kuninori Morimoto [this message]
2023-09-11 23:49 ` [PATCH 19/54] ASoC: meson: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 20/54] ASoC: sunxi: " Kuninori Morimoto
2023-09-12  4:06   ` Jernej Škrabec
2023-09-11 23:49 ` [PATCH 21/54] ASoC: tegra: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 22/54] ASoC: ux500: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 23/54] ASoC: google: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 24/54] ASoC: cirrus: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 25/54] ASoC: generic: " Kuninori Morimoto
2023-09-14 10:03   ` Dan Carpenter
2023-09-14 23:03     ` Kuninori Morimoto
2023-09-15  6:39       ` Dan Carpenter
2023-09-19  0:19         ` Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 26/54] ASoC: samsung: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 27/54] ASoC: extensa: " Kuninori Morimoto
2023-09-11 23:49 ` [PATCH 28/54] ASoC: kirkwood: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 29/54] ASoC: loongson: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 30/54] ASoC: mediatek: " Kuninori Morimoto
2023-09-25 12:12   ` Mark Brown
2023-09-11 23:50 ` [PATCH 31/54] ASoC: rockchip: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 32/54] ASoC: starfive: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 33/54] ASoC: uniphier: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 34/54] ASoC: soundwire: " Kuninori Morimoto
2023-09-20  7:22   ` Vinod Koul
2023-09-11 23:50 ` [PATCH 35/54] ASoC: intel: " Kuninori Morimoto
2023-09-25 12:14   ` Mark Brown
2023-09-11 23:50 ` [PATCH 36/54] ASoC: intel: avs: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 37/54] ASoC: codec: wm: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 38/54] ASoC: codec: rt5677: " Kuninori Morimoto
2023-09-11 23:50 ` [PATCH 39/54] ASoC: codec: cs47lxx: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 40/54] ASoC: sof: " Kuninori Morimoto
2023-09-25 12:15   ` Mark Brown
2023-09-11 23:51 ` [PATCH 41/54] ASoC: sof: amd: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 42/54] ASoC: sof: intel: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 43/54] ASoC: sof: mediatek: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 44/54] ASoC: soc-dai: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 45/54] ASoC: soc-pcm: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 46/54] ASoC: soc-core: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 47/54] ASoC: soc-dapm: " Kuninori Morimoto
2023-09-11 23:51 ` [PATCH 48/54] ASoC: soc-link: " Kuninori Morimoto
2023-09-11 23:52 ` [PATCH 49/54] ASoC: soc-utils: " Kuninori Morimoto
2023-09-11 23:52 ` [PATCH 50/54] ASoC: soc-topology: " Kuninori Morimoto
2023-09-11 23:52 ` [PATCH 51/54] ASoC: soc-compress: " Kuninori Morimoto
2023-09-20  7:22   ` Vinod Koul
2023-09-11 23:52 ` [PATCH 52/54] ASoC: soc-component: " Kuninori Morimoto
2023-09-11 23:52 ` [PATCH 53/54] ASoC: soc-generic-dmaengine-pcm: " Kuninori Morimoto
2023-09-11 23:52 ` [PATCH 54/54] ASoC: remove asoc_xxx() compatible macro Kuninori Morimoto
2023-09-26 15:06 ` [PATCH 00/54] ASoC: convert asoc_xxx() to snd_soc_xxx() Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87r0n4qniq.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alexandre.belloni@bootlin.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=claudiu.beznea@tuxon.dev \
    --cc=lgirdwood@gmail.com \
    --cc=nicolas.ferre@microchip.com \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.