All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Jaroslav Kysela <perex@perex.cz>,
	Kunihiko Hayashi <hayashi.kunihiko@socionext.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH 33/54] ASoC: uniphier: convert not to use asoc_xxx()
Date: Mon, 11 Sep 2023 23:50:24 +0000	[thread overview]
Message-ID: <875y4gqngf.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/uniphier/aio-compress.c | 22 +++++++++++-----------
 sound/soc/uniphier/aio-dma.c      | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/sound/soc/uniphier/aio-compress.c b/sound/soc/uniphier/aio-compress.c
index 7d1492c15b575..4a19d4908ffd6 100644
--- a/sound/soc/uniphier/aio-compress.c
+++ b/sound/soc/uniphier/aio-compress.c
@@ -25,7 +25,7 @@ static int uniphier_aio_comprdma_new(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_compr *compr = rtd->compr;
 	struct device *dev = compr->card->dev;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[compr->direction];
 	size_t size = AUD_RING_SIZE;
 	int dma_dir = DMA_FROM_DEVICE, ret;
@@ -58,7 +58,7 @@ static int uniphier_aio_comprdma_free(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_compr *compr = rtd->compr;
 	struct device *dev = compr->card->dev;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[compr->direction];
 	int dma_dir = DMA_FROM_DEVICE;
 
@@ -76,7 +76,7 @@ static int uniphier_aio_compr_open(struct snd_soc_component *component,
 				   struct snd_compr_stream *cstream)
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	int ret;
 
@@ -102,7 +102,7 @@ static int uniphier_aio_compr_free(struct snd_soc_component *component,
 				   struct snd_compr_stream *cstream)
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	int ret;
 
@@ -123,7 +123,7 @@ static int uniphier_aio_compr_get_params(struct snd_soc_component *component,
 					 struct snd_codec *params)
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 
 	*params = sub->cparams.codec;
@@ -136,7 +136,7 @@ static int uniphier_aio_compr_set_params(struct snd_soc_component *component,
 					 struct snd_compr_params *params)
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	struct device *dev = &aio->chip->pdev->dev;
 
@@ -167,7 +167,7 @@ static int uniphier_aio_compr_hw_free(struct snd_soc_component *component,
 				      struct snd_compr_stream *cstream)
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 
 	sub->setting = 0;
@@ -180,7 +180,7 @@ static int uniphier_aio_compr_prepare(struct snd_soc_component *component,
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
 	struct snd_compr_runtime *runtime = cstream->runtime;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	int bytes = runtime->fragment_size;
 	unsigned long flags;
@@ -219,7 +219,7 @@ static int uniphier_aio_compr_trigger(struct snd_soc_component *component,
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
 	struct snd_compr_runtime *runtime = cstream->runtime;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	struct device *dev = &aio->chip->pdev->dev;
 	int bytes = runtime->fragment_size, ret = 0;
@@ -253,7 +253,7 @@ static int uniphier_aio_compr_pointer(struct snd_soc_component *component,
 {
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
 	struct snd_compr_runtime *runtime = cstream->runtime;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	int bytes = runtime->fragment_size;
 	unsigned long flags;
@@ -328,7 +328,7 @@ static int uniphier_aio_compr_copy(struct snd_soc_component *component,
 	struct snd_soc_pcm_runtime *rtd = cstream->private_data;
 	struct snd_compr_runtime *runtime = cstream->runtime;
 	struct device *carddev = rtd->compr->card->dev;
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];
 	size_t cnt = min_t(size_t, count, aio_rb_space_to_end(sub) / 2);
 	int bytes = runtime->fragment_size;
diff --git a/sound/soc/uniphier/aio-dma.c b/sound/soc/uniphier/aio-dma.c
index 3d9736e7381f8..fe272befd9676 100644
--- a/sound/soc/uniphier/aio-dma.c
+++ b/sound/soc/uniphier/aio-dma.c
@@ -108,8 +108,8 @@ static int uniphier_aiodma_prepare(struct snd_soc_component *component,
 				   struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[substream->stream];
 	int bytes = runtime->period_size *
 		runtime->channels * samples_to_bytes(runtime, 1);
@@ -135,8 +135,8 @@ static int uniphier_aiodma_trigger(struct snd_soc_component *component,
 				   struct snd_pcm_substream *substream, int cmd)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[substream->stream];
 	struct device *dev = &aio->chip->pdev->dev;
 	int bytes = runtime->period_size *
@@ -171,8 +171,8 @@ static snd_pcm_uframes_t uniphier_aiodma_pointer(
 					struct snd_pcm_substream *substream)
 {
 	struct snd_pcm_runtime *runtime = substream->runtime;
-	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-	struct uniphier_aio *aio = uniphier_priv(asoc_rtd_to_cpu(rtd, 0));
+	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+	struct uniphier_aio *aio = uniphier_priv(snd_soc_rtd_to_cpu(rtd, 0));
 	struct uniphier_aio_sub *sub = &aio->sub[substream->stream];
 	int bytes = runtime->period_size *
 		runtime->channels * samples_to_bytes(runtime, 1);
-- 
2.25.1


  parent reply	other threads:[~2023-09-11 23:57 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 ` [PATCH 18/54] ASoC: atmel: " Kuninori Morimoto
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 ` Kuninori Morimoto [this message]
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=875y4gqngf.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=hayashi.kunihiko@socionext.com \
    --cc=lgirdwood@gmail.com \
    --cc=mhiramat@kernel.org \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /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.