From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Florian Fainelli <florian.fainelli@broadcom.com>,
Jaroslav Kysela <perex@perex.cz>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH 08/38] ASoC: bcm: merge DAI call back functions into ops
Date: Wed, 2 Aug 2023 00:53:18 +0000 [thread overview]
Message-ID: <87y1iutgch.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87a5vauuzg.wl-kuninori.morimoto.gx@renesas.com>
ALSA SoC merges DAI call backs into .ops.
This patch merge thesse into one.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/bcm/bcm2835-i2s.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sound/soc/bcm/bcm2835-i2s.c b/sound/soc/bcm/bcm2835-i2s.c
index 85f705afcdbb..9bda6499e66e 100644
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-i2s.c
@@ -737,7 +737,19 @@ static void bcm2835_i2s_shutdown(struct snd_pcm_substream *substream,
bcm2835_i2s_stop_clock(dev);
}
+static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai)
+{
+ struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+
+ snd_soc_dai_init_dma_data(dai,
+ &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK],
+ &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]);
+
+ return 0;
+}
+
static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
+ .probe = bcm2835_i2s_dai_probe,
.startup = bcm2835_i2s_startup,
.shutdown = bcm2835_i2s_shutdown,
.prepare = bcm2835_i2s_prepare,
@@ -748,20 +760,8 @@ static const struct snd_soc_dai_ops bcm2835_i2s_dai_ops = {
.set_tdm_slot = bcm2835_i2s_set_dai_tdm_slot,
};
-static int bcm2835_i2s_dai_probe(struct snd_soc_dai *dai)
-{
- struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
-
- snd_soc_dai_init_dma_data(dai,
- &dev->dma_data[SNDRV_PCM_STREAM_PLAYBACK],
- &dev->dma_data[SNDRV_PCM_STREAM_CAPTURE]);
-
- return 0;
-}
-
static struct snd_soc_dai_driver bcm2835_i2s_dai = {
.name = "bcm2835-i2s",
- .probe = bcm2835_i2s_dai_probe,
.playback = {
.channels_min = 2,
.channels_max = 2,
--
2.25.1
next prev parent reply other threads:[~2023-08-02 0:55 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-02 0:51 [PATCH 00/38] ASoC: merge DAI call back functions into ops Kuninori Morimoto
2023-08-02 0:52 ` [PATCH 01/38] ASoC: soc-dai.h: " Kuninori Morimoto
2023-08-02 0:52 ` [PATCH 02/38] ASoC: ti: " Kuninori Morimoto
2023-08-02 0:52 ` [PATCH 03/38] ASoC: adi: " Kuninori Morimoto
2023-08-02 0:52 ` [PATCH 04/38] " Kuninori Morimoto
2023-08-02 0:52 ` [PATCH 05/38] ASoC: amd: " Kuninori Morimoto
2023-08-02 0:52 ` [PATCH 06/38] ASoC: dwc: " Kuninori Morimoto
2023-08-03 5:48 ` Maxim Kochetkov
2023-08-02 0:53 ` [PATCH 07/38] ASoC: pxa: " Kuninori Morimoto
2023-08-02 0:53 ` Kuninori Morimoto [this message]
2023-08-02 0:53 ` [PATCH 09/38] ASoC: fsl: " Kuninori Morimoto
2023-08-02 0:53 ` [PATCH 10/38] ASoC: img: " Kuninori Morimoto
2023-08-02 0:53 ` [PATCH 11/38] ASoC: sof: " Kuninori Morimoto
2023-08-02 0:53 ` [PATCH 12/38] ASoC: sti: " Kuninori Morimoto
2023-08-02 0:54 ` [PATCH 13/38] ASoC: stm: " Kuninori Morimoto
2023-08-02 0:54 ` [PATCH 14/38] ASoC: pxa: " Kuninori Morimoto
2023-08-02 0:54 ` [PATCH 15/38] ASoC: rsnd: " Kuninori Morimoto
2023-08-02 0:54 ` [PATCH 16/38] ASoC: qcom: " Kuninori Morimoto
2023-08-02 0:54 ` [PATCH 17/38] ASoC: ux500: " Kuninori Morimoto
2023-08-02 0:54 ` [PATCH 18/38] ASoC: sunxi: " Kuninori Morimoto
2023-08-02 19:47 ` Jernej Škrabec
2023-08-02 0:55 ` [PATCH 19/38] ASoC: tegra: " Kuninori Morimoto
2023-08-02 0:55 ` [PATCH 20/38] ASoC: atmel: " Kuninori Morimoto
2023-08-02 0:55 ` [PATCH 21/38] ASoC: intel: " Kuninori Morimoto
2023-08-02 0:55 ` [PATCH 22/38] ASoC: meson: " Kuninori Morimoto
2023-08-02 0:55 ` [PATCH 23/38] ASoC: jz4740: " Kuninori Morimoto
2023-08-02 0:55 ` [PATCH 24/38] ASoC: cirrus: " Kuninori Morimoto
2023-08-02 12:25 ` Alexander Sverdlin
2023-08-02 0:56 ` [PATCH 25/38] ASoC: drm/vc4: " Kuninori Morimoto
2023-08-02 0:56 ` [PATCH 26/38] ASoC: samsung: " Kuninori Morimoto
2023-08-02 0:56 ` [PATCH 27/38] ASoC: mediatek: " Kuninori Morimoto
2023-08-02 12:25 ` Trevor Wu (吳文良)
2023-08-02 23:12 ` Kuninori Morimoto
2023-08-03 5:13 ` Trevor Wu (吳文良)
2023-08-02 0:57 ` [PATCH 28/38] ASoC: rockchip: " Kuninori Morimoto
2023-08-02 0:57 ` [PATCH 29/38] ASoC: uniphier: " Kuninori Morimoto
2023-08-02 0:57 ` [PATCH 30/38] ASoC: loongson: " Kuninori Morimoto
2023-08-02 0:57 ` [PATCH 31/38] ASoC: starfive: " Kuninori Morimoto
2023-08-02 1:13 ` Walker Chen
2023-08-02 0:57 ` [PATCH 32/38] ASoC: hisilicon: " Kuninori Morimoto
2023-08-02 0:57 ` [PATCH 33/38] ASoC: codecs/wm*: " Kuninori Morimoto
2023-08-02 0:58 ` [PATCH 34/38] ASoC: soc-topology: " Kuninori Morimoto
2023-08-02 0:58 ` [PATCH 35/38] ASoC: codecs/cs47lxx: " Kuninori Morimoto
2023-08-02 0:58 ` [PATCH 36/38] ASoC: codecs/cx2072x: " Kuninori Morimoto
2023-08-02 0:58 ` [PATCH 37/38] ASoC: codecs/hdmi-codec: " Kuninori Morimoto
2023-08-02 0:58 ` [PATCH 38/38] ASoC: soc-dai.h: remove unused call back functions 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=87y1iutgch.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=florian.fainelli@broadcom.com \
--cc=lgirdwood@gmail.com \
--cc=perex@perex.cz \
--cc=rjui@broadcom.com \
--cc=sbranden@broadcom.com \
--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).