All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Jaroslav Kysela <perex@perex.cz>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>,
	Thierry Reding <thierry.reding@gmail.com>
Cc: alsa-devel@alsa-project.org
Subject: [PATCH v2 20/39] ASoC: tegra: merge DAI call back functions into ops
Date: Tue, 8 Aug 2023 22:56:58 +0000	[thread overview]
Message-ID: <874jl9b0sl.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87wmy5b0wt.wl-kuninori.morimoto.gx@renesas.com>

ALSA SoC merges DAI call backs into .ops.
This patch merge these into one.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 sound/soc/tegra/tegra20_ac97.c    | 10 +++++-----
 sound/soc/tegra/tegra20_i2s.c     |  2 +-
 sound/soc/tegra/tegra20_spdif.c   |  2 +-
 sound/soc/tegra/tegra210_admaif.c | 12 ++++++------
 sound/soc/tegra/tegra30_i2s.c     |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c
index 60e7df41c64c..e713feca25fa 100644
--- a/sound/soc/tegra/tegra20_ac97.c
+++ b/sound/soc/tegra/tegra20_ac97.c
@@ -203,10 +203,6 @@ static int tegra20_ac97_trigger(struct snd_pcm_substream *substream, int cmd,
 	return 0;
 }
 
-static const struct snd_soc_dai_ops tegra20_ac97_dai_ops = {
-	.trigger	= tegra20_ac97_trigger,
-};
-
 static int tegra20_ac97_probe(struct snd_soc_dai *dai)
 {
 	struct tegra20_ac97 *ac97 = snd_soc_dai_get_drvdata(dai);
@@ -217,9 +213,13 @@ static int tegra20_ac97_probe(struct snd_soc_dai *dai)
 	return 0;
 }
 
+static const struct snd_soc_dai_ops tegra20_ac97_dai_ops = {
+	.probe		= tegra20_ac97_probe,
+	.trigger	= tegra20_ac97_trigger,
+};
+
 static struct snd_soc_dai_driver tegra20_ac97_dai = {
 	.name = "tegra-ac97-pcm",
-	.probe = tegra20_ac97_probe,
 	.playback = {
 		.stream_name = "PCM Playback",
 		.channels_min = 2,
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index d38b58305c6b..f11618e8f13e 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -310,6 +310,7 @@ static int tegra20_i2s_startup(struct snd_pcm_substream *substream,
 }
 
 static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = {
+	.probe		= tegra20_i2s_probe,
 	.set_fmt	= tegra20_i2s_set_fmt,
 	.hw_params	= tegra20_i2s_hw_params,
 	.trigger	= tegra20_i2s_trigger,
@@ -317,7 +318,6 @@ static const struct snd_soc_dai_ops tegra20_i2s_dai_ops = {
 };
 
 static const struct snd_soc_dai_driver tegra20_i2s_dai_template = {
-	.probe = tegra20_i2s_probe,
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 2,
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index d034803695a0..b0670aa4d967 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -241,6 +241,7 @@ static int tegra20_spdif_probe(struct snd_soc_dai *dai)
 }
 
 static const struct snd_soc_dai_ops tegra20_spdif_dai_ops = {
+	.probe = tegra20_spdif_probe,
 	.hw_params = tegra20_spdif_hw_params,
 	.trigger = tegra20_spdif_trigger,
 	.startup = tegra20_spdif_startup,
@@ -248,7 +249,6 @@ static const struct snd_soc_dai_ops tegra20_spdif_dai_ops = {
 
 static struct snd_soc_dai_driver tegra20_spdif_dai = {
 	.name = "tegra20-spdif",
-	.probe = tegra20_spdif_probe,
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 2,
diff --git a/sound/soc/tegra/tegra210_admaif.c b/sound/soc/tegra/tegra210_admaif.c
index 6868508585a0..9f9334e48049 100644
--- a/sound/soc/tegra/tegra210_admaif.c
+++ b/sound/soc/tegra/tegra210_admaif.c
@@ -419,11 +419,6 @@ static int tegra_admaif_trigger(struct snd_pcm_substream *substream, int cmd,
 	}
 }
 
-static const struct snd_soc_dai_ops tegra_admaif_dai_ops = {
-	.hw_params	= tegra_admaif_hw_params,
-	.trigger	= tegra_admaif_trigger,
-};
-
 static int tegra210_admaif_pget_mono_to_stereo(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_value *ucontrol)
 {
@@ -550,10 +545,15 @@ static int tegra_admaif_dai_probe(struct snd_soc_dai *dai)
 	return 0;
 }
 
+static const struct snd_soc_dai_ops tegra_admaif_dai_ops = {
+	.probe		= tegra_admaif_dai_probe,
+	.hw_params	= tegra_admaif_hw_params,
+	.trigger	= tegra_admaif_trigger,
+};
+
 #define DAI(dai_name)					\
 	{							\
 		.name = dai_name,				\
-		.probe = tegra_admaif_dai_probe,		\
 		.playback = {					\
 			.stream_name = dai_name " Playback",	\
 			.channels_min = 1,			\
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 644280603095..81eaece51130 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -304,6 +304,7 @@ static int tegra30_i2s_probe(struct snd_soc_dai *dai)
 }
 
 static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = {
+	.probe		= tegra30_i2s_probe,
 	.set_fmt	= tegra30_i2s_set_fmt,
 	.hw_params	= tegra30_i2s_hw_params,
 	.trigger	= tegra30_i2s_trigger,
@@ -311,7 +312,6 @@ static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = {
 };
 
 static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {
-	.probe = tegra30_i2s_probe,
 	.playback = {
 		.stream_name = "Playback",
 		.channels_min = 2,
-- 
2.25.1


  parent reply	other threads:[~2023-08-08 23:01 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-08 22:54 [PATCH v2 00/39] ASoC: merge DAI call back functions into ops Kuninori Morimoto
2023-08-08 22:54 ` [PATCH v2 01/39] ASoC: soc-dai.h: " Kuninori Morimoto
2023-08-14 22:05   ` Mark Brown
2023-08-08 22:54 ` [PATCH v2 02/39] ASoC: ti: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 03/39] ASoC: adi: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 04/39] " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 05/39] ASoC: amd: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 06/39] ASoC: dwc: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 07/39] ASoC: pxa: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 08/39] ASoC: bcm: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 09/39] ASoC: fsl: " Kuninori Morimoto
2023-08-08 22:55 ` [PATCH v2 10/39] ASoC: img: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 11/39] ASoC: sof: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 12/39] ASoC: sti: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 13/39] ASoC: stm: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 14/39] ASoC: pxa: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 15/39] ASoC: rsnd: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 16/39] ASoC: qcom: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 17/39] ASoC: au1x: " Kuninori Morimoto
2023-08-08 22:56 ` [PATCH v2 18/39] ASoC: ux500: " Kuninori Morimoto
2023-08-09  8:05   ` Linus Walleij
2023-08-08 22:56 ` [PATCH v2 19/39] ASoC: sunxi: " Kuninori Morimoto
2023-08-08 22:56 ` Kuninori Morimoto [this message]
2023-08-08 22:57 ` [PATCH v2 21/39] ASoC: atmel: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 22/39] ASoC: intel: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 23/39] ASoC: meson: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 24/39] ASoC: jz4740: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 25/39] ASoC: cirrus: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 26/39] ASoC: drm/vc4: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 27/39] ASoC: samsung: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 28/39] ASoC: mediatek: " Kuninori Morimoto
2023-08-08 22:57 ` [PATCH v2 29/39] ASoC: rockchip: " Kuninori Morimoto
2023-08-09 13:20   ` Heiko Stuebner
2023-08-08 22:58 ` [PATCH v2 30/39] ASoC: uniphier: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 31/39] ASoC: loongson: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 32/39] ASoC: starfive: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 33/39] ASoC: hisilicon: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 34/39] ASoC: codecs/wm*: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 35/39] ASoC: soc-topology: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 36/39] ASoC: codecs/cs47lxx: " Kuninori Morimoto
2023-08-09  9:33   ` Charles Keepax
2023-08-08 22:58 ` [PATCH v2 37/39] ASoC: codecs/cx2072x: " Kuninori Morimoto
2023-08-08 22:58 ` [PATCH v2 38/39] ASoC: codecs/hdmi-codec: " Kuninori Morimoto
2023-08-08 22:59 ` [PATCH v2 39/39] ASoC: soc-dai.h: remove unused call back functions Kuninori Morimoto
2023-08-14 22:06 ` [PATCH v2 00/39] ASoC: merge DAI call back functions into ops 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=874jl9b0sl.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=lgirdwood@gmail.com \
    --cc=perex@perex.cz \
    --cc=thierry.reding@gmail.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 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.