From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Ban Tao <fengzheng923@gmail.com>, Chen-Yu Tsai <wens@csie.org>,
Jaroslav Kysela <perex@perex.cz>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Samuel Holland <samuel@sholland.org>,
Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH v2 20/54] ASoC: sunxi: convert not to use asoc_xxx()
Date: Tue, 26 Sep 2023 06:22:31 +0000 [thread overview]
Message-ID: <87lecth2s8.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87edilihhg.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().
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
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 f0a5fd901101..ad6336cefaea 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 b849bb7cf58e..199cfee41d31 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 2599683a582d..3f6fdab75b5f 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)
--
2.25.1
next prev parent reply other threads:[~2023-09-26 15:13 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 6:19 [PATCH v2 00/54] ASoC: convert asoc_xxx() to snd_soc_xxx() Kuninori Morimoto
2023-09-26 6:20 ` [PATCH v2 01/54] ASoC: soc.h: " Kuninori Morimoto
2023-09-26 6:20 ` [PATCH v2 02/54] ASoC: simple_card_utils.h: convert not to use asoc_xxx() Kuninori Morimoto
2023-09-26 6:20 ` [PATCH v2 03/54] ASoC: sh: " Kuninori Morimoto
2023-09-26 6:20 ` [PATCH v2 04/54] ASoC: ti: " Kuninori Morimoto
2023-09-26 6:20 ` [PATCH v2 05/54] ASoC: arm: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 06/54] ASoC: amd: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 07/54] ASoC: bcm: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 08/54] ASoC: dwc: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 09/54] ASoC: fsl: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 10/54] ASoC: img: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 11/54] ASoC: mxs: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 12/54] ASoC: pxa: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 13/54] ASoC: stm: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 14/54] ASoC: au1x: " Kuninori Morimoto
2023-09-26 6:21 ` [PATCH v2 15/54] ASoC: qcom: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 16/54] ASoC: sprd: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 17/54] ASoC: apple: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 18/54] ASoC: atmel: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 19/54] ASoC: meson: " Kuninori Morimoto
2023-09-26 6:22 ` Kuninori Morimoto [this message]
2023-09-26 6:22 ` [PATCH v2 21/54] ASoC: tegra: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 22/54] ASoC: ux500: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 23/54] ASoC: google: " Kuninori Morimoto
2023-09-26 6:22 ` [PATCH v2 24/54] ASoC: cirrus: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 25/54] ASoC: generic: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 26/54] ASoC: samsung: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 27/54] ASoC: extensa: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 28/54] ASoC: kirkwood: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 29/54] ASoC: loongson: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 30/54] ASoC: mediatek: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 31/54] ASoC: rockchip: " Kuninori Morimoto
2023-09-26 6:23 ` [PATCH v2 32/54] ASoC: starfive: " Kuninori Morimoto
2023-09-26 6:24 ` [PATCH v2 33/54] ASoC: uniphier: " Kuninori Morimoto
2023-09-26 6:24 ` [PATCH v2 34/54] ASoC: soundwire: " Kuninori Morimoto
2023-09-26 6:24 ` [PATCH v2 35/54] ASoC: intel: " Kuninori Morimoto
2023-09-26 6:24 ` [PATCH v2 36/54] ASoC: intel: avs: " Kuninori Morimoto
2023-09-26 6:24 ` [PATCH v2 37/54] ASoC: codec: wm: " Kuninori Morimoto
2023-09-26 6:24 ` [PATCH v2 38/54] ASoC: codec: rt5677: " Kuninori Morimoto
2023-09-26 6:25 ` [PATCH v2 39/54] ASoC: codec: cs47lxx: " Kuninori Morimoto
2023-09-26 6:25 ` [PATCH v2 40/54] ASoC: sof: " Kuninori Morimoto
2023-09-26 6:25 ` [PATCH v2 41/54] ASoC: sof: amd: " Kuninori Morimoto
2023-09-26 6:25 ` [PATCH v2 42/54] ASoC: sof: intel: " Kuninori Morimoto
2023-09-26 6:25 ` [PATCH v2 43/54] ASoC: sof: mediatek: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 44/54] ASoC: soc-dai: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 45/54] ASoC: soc-pcm: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 46/54] ASoC: soc-core: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 47/54] ASoC: soc-dapm: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 48/54] ASoC: soc-link: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 49/54] ASoC: soc-utils: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 50/54] ASoC: soc-topology: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 51/54] ASoC: soc-compress: " Kuninori Morimoto
2023-09-26 6:26 ` [PATCH v2 52/54] ASoC: soc-component: " Kuninori Morimoto
2023-09-26 6:27 ` [PATCH v2 53/54] ASoC: soc-generic-dmaengine-pcm: " Kuninori Morimoto
2023-09-26 6:27 ` [PATCH v2 54/54] ASoC: remove asoc_xxx() compatible macro Kuninori Morimoto
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=87lecth2s8.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=fengzheng923@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=perex@perex.cz \
--cc=samuel@sholland.org \
--cc=tiwai@suse.com \
--cc=wens@csie.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).