From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: "\"Martin Povišer\"" <povik+lin@cutebit.org>,
"Jaroslav Kysela" <perex@perex.cz>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Takashi Iwai" <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH v2 17/54] ASoC: apple: convert not to use asoc_xxx()
Date: Tue, 26 Sep 2023 06:22:12 +0000 [thread overview]
Message-ID: <87pm25h2ss.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().
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/apple/mca.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c
index ce77934f3eef..9f64a9e74c54 100644
--- a/sound/soc/apple/mca.c
+++ b/sound/soc/apple/mca.c
@@ -546,7 +546,7 @@ static int mca_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
static int mca_fe_get_port(struct snd_pcm_substream *substream)
{
- struct snd_soc_pcm_runtime *fe = asoc_substream_to_rtd(substream);
+ struct snd_soc_pcm_runtime *fe = snd_soc_substream_to_rtd(substream);
struct snd_soc_pcm_runtime *be;
struct snd_soc_dpcm *dpcm;
@@ -559,7 +559,7 @@ static int mca_fe_get_port(struct snd_pcm_substream *substream)
if (!be)
return -EINVAL;
- return mca_dai_to_cluster(asoc_rtd_to_cpu(be, 0))->no;
+ return mca_dai_to_cluster(snd_soc_rtd_to_cpu(be, 0))->no;
}
static int mca_fe_hw_params(struct snd_pcm_substream *substream,
@@ -700,7 +700,7 @@ static bool mca_be_started(struct mca_cluster *cl)
static int mca_be_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- struct snd_soc_pcm_runtime *be = asoc_substream_to_rtd(substream);
+ struct snd_soc_pcm_runtime *be = snd_soc_substream_to_rtd(substream);
struct snd_soc_pcm_runtime *fe;
struct mca_cluster *cl = mca_dai_to_cluster(dai);
struct mca_cluster *fe_cl;
@@ -721,7 +721,7 @@ static int mca_be_startup(struct snd_pcm_substream *substream,
if (!fe)
return -EINVAL;
- fe_cl = mca_dai_to_cluster(asoc_rtd_to_cpu(fe, 0));
+ fe_cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(fe, 0));
if (mca_be_started(cl)) {
/*
@@ -811,8 +811,8 @@ static int mca_set_runtime_hwparams(struct snd_soc_component *component,
static int mca_pcm_open(struct snd_soc_component *component,
struct snd_pcm_substream *substream)
{
- struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
- struct mca_cluster *cl = mca_dai_to_cluster(asoc_rtd_to_cpu(rtd, 0));
+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
+ struct mca_cluster *cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(rtd, 0));
struct dma_chan *chan = cl->dma_chans[substream->stream];
int ret;
@@ -830,7 +830,7 @@ static int mca_hw_params(struct snd_soc_component *component,
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_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
struct dma_chan *chan = snd_dmaengine_pcm_get_chan(substream);
struct dma_slave_config slave_config;
int ret;
@@ -857,7 +857,7 @@ static int mca_hw_params(struct snd_soc_component *component,
static int mca_close(struct snd_soc_component *component,
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);
if (rtd->dai_link->no_pcm)
return 0;
@@ -868,7 +868,7 @@ static int mca_close(struct snd_soc_component *component,
static int mca_trigger(struct snd_soc_component *component,
struct snd_pcm_substream *substream, int cmd)
{
- struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
+ struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
if (rtd->dai_link->no_pcm)
return 0;
@@ -877,7 +877,7 @@ static int mca_trigger(struct snd_soc_component *component,
* Before we do the PCM trigger proper, insert an opportunity
* to reset the frontend's SERDES.
*/
- mca_fe_early_trigger(substream, cmd, asoc_rtd_to_cpu(rtd, 0));
+ mca_fe_early_trigger(substream, cmd, snd_soc_rtd_to_cpu(rtd, 0));
return snd_dmaengine_pcm_trigger(substream, cmd);
}
@@ -885,7 +885,7 @@ static int mca_trigger(struct snd_soc_component *component,
static snd_pcm_uframes_t mca_pointer(struct snd_soc_component *component,
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);
if (rtd->dai_link->no_pcm)
return -ENOTSUPP;
@@ -911,7 +911,7 @@ static void mca_pcm_free(struct snd_soc_component *component,
struct snd_pcm *pcm)
{
struct snd_soc_pcm_runtime *rtd = snd_pcm_chip(pcm);
- struct mca_cluster *cl = mca_dai_to_cluster(asoc_rtd_to_cpu(rtd, 0));
+ struct mca_cluster *cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(rtd, 0));
unsigned int i;
if (rtd->dai_link->no_pcm)
@@ -933,7 +933,7 @@ static void mca_pcm_free(struct snd_soc_component *component,
static int mca_pcm_new(struct snd_soc_component *component,
struct snd_soc_pcm_runtime *rtd)
{
- struct mca_cluster *cl = mca_dai_to_cluster(asoc_rtd_to_cpu(rtd, 0));
+ struct mca_cluster *cl = mca_dai_to_cluster(snd_soc_rtd_to_cpu(rtd, 0));
unsigned int i;
if (rtd->dai_link->no_pcm)
--
2.25.1
next prev parent reply other threads:[~2023-09-26 15:12 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 ` Kuninori Morimoto [this message]
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 ` [PATCH v2 20/54] ASoC: sunxi: " Kuninori Morimoto
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=87pm25h2ss.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=perex@perex.cz \
--cc=povik+lin@cutebit.org \
--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 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).