From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: "\"Amadeusz Sławiński\"" <amadeuszx.slawinski@linux.intel.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Alper Nebi Yasak" <alpernebiyasak@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Banajit Goswami" <bgoswami@quicinc.com>,
"Bard Liao" <yung-chuan.liao@linux.intel.com>,
"Brent Lu" <brent.lu@intel.com>,
"Cezary Rojewski" <cezary.rojewski@intel.com>,
"Charles Keepax" <ckeepax@opensource.cirrus.com>,
"Claudiu Beznea" <claudiu.beznea@tuxon.dev>,
"Cristian Ciocaltea" <cristian.ciocaltea@collabora.com>,
"Daniel Baluta" <daniel.baluta@nxp.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Jerome Brunet" <jbrunet@baylibre.com>,
"Jiawei Wang" <me@jwang.link>, "Jonathan Corbet" <corbet@lwn.net>,
"Kai Vehmanen" <kai.vehmanen@linux.intel.com>,
"Kevin Hilman" <khilman@baylibre.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Maso Huang" <maso.huang@mediatek.com>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Neil Armstrong" <neil.armstrong@linaro.org>,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Peter Ujfalusi" <peter.ujfalusi@linux.intel.com>,
"Pierre-Louis Bossart" <pierre-louis.bossart@linux.intel.com>,
"Ranjani Sridharan" <ranjani.sridharan@linux.intel.com>,
"Sascha Hauer" <s.hauer@pengutronix.de>,
"Shawn Guo" <shawnguo@kernel.org>,
"Shengjiu Wang" <shengjiu.wang@gmail.com>,
"Srinivas Kandagatla" <srinivas.kandagatla@linaro.org>,
"Sylwester Nawrocki" <s.nawrocki@samsung.com>,
"Takashi Iwai" <tiwai@suse.com>, "Vinod Koul" <vkoul@kernel.org>,
"Xiubo Li" <Xiubo.Lee@gmail.com>,
alsa-devel@alsa-project.org, imx@lists.linux.dev,
linux-doc@vger.kernel.org, linux-sound@vger.kernel.org
Subject: [PATCH v3 22/23] ASoC: soc-pcm: remove dpcm_playback/capture and playback/capture_only
Date: Thu, 18 Apr 2024 04:15:36 +0000 [thread overview]
Message-ID: <87le5b71cn.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87h6fz8g3u.wl-kuninori.morimoto.gx@renesas.com>
No driver is using dpcm_playback/capture and playback/capture_only flag,
let's remove these.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc.h | 8 --------
sound/soc/soc-core.c | 7 -------
sound/soc/soc-pcm.c | 18 ------------------
3 files changed, 33 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index e604d74f6e33..37602141834b 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -787,10 +787,6 @@ struct snd_soc_dai_link {
/* Mark this pcm with non atomic ops */
unsigned int nonatomic:1;
- /* For unidirectional dai links */
- unsigned int playback_only:1;
- unsigned int capture_only:1;
-
/* Keep DAI active over suspend */
unsigned int ignore_suspend:1;
@@ -805,10 +801,6 @@ struct snd_soc_dai_link {
/* This DAI link can route to other DAI links at runtime (Frontend)*/
unsigned int dynamic:1;
- /* DPCM capture and Playback support */
- unsigned int dpcm_capture:1;
- unsigned int dpcm_playback:1;
-
/*
* Capture / Playback support assertion. Having assertion flag is not mandatory.
* In case of having assertion flag, non specific side will be disabled.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6667f34e875a..64270a4f75c6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2011,13 +2011,6 @@ static void soc_check_tplg_fes(struct snd_soc_card *card)
dev_warn(card->dev,
"invalid configuration, dailink %s has flags no_pcm=0 and capture_assertion=1\n",
dai_link->name);
-
- /* convert normal link into DPCM one */
- if (!(dai_link->playback_assertion ||
- dai_link->capture_assertion)) {
- dai_link->playback_assertion = !dai_link->capture_only;
- dai_link->capture_assertion = !dai_link->playback_only;
- }
}
/*
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index a79ca115f4e7..4ceca99e266f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2808,24 +2808,6 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
return -EINVAL;
}
- /*
- * REMOVE ME
- *
- * dpcm_playback/capture will be used as playback/capture_assertion
- */
- if (dai_link->playback_only && dai_link->capture_only) {
- dev_err(rtd->dev, "both playback_only / capture_only are set\n");
- return -EINVAL;
- }
- if (dai_link->playback_only)
- dai_link->playback_assertion = 1;
- if (dai_link->capture_only)
- dai_link->capture_assertion = 1;
- if (dai_link->dpcm_playback)
- dai_link->playback_assertion = 1;
- if (dai_link->dpcm_capture)
- dai_link->capture_assertion = 1;
-
/* Adapt stream for codec2codec links */
cpu_playback = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_PLAYBACK);
cpu_capture = snd_soc_get_stream_cpu(dai_link, SNDRV_PCM_STREAM_CAPTURE);
--
2.25.1
next prev parent reply other threads:[~2024-04-18 4:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-18 4:11 [PATCH v3 00/23] ASoC: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 01/23] ASoC: soc-pcm: cleanup soc_get_playback_capture() Kuninori Morimoto
2024-04-18 16:20 ` Pierre-Louis Bossart
2024-04-19 1:09 ` Kuninori Morimoto
2024-04-19 13:17 ` Pierre-Louis Bossart
2024-04-22 4:46 ` Kuninori Morimoto
2024-04-22 20:12 ` Pierre-Louis Bossart
2024-04-23 4:56 ` Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 02/23] ASoC: soc-pcm: indicate warning if DPCM BE Codec has no settings Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 03/23] ASoC: soc-dai: remove snd_soc_dai_link_set_capabilities() Kuninori Morimoto
2024-04-18 4:12 ` [PATCH v3 04/23] ASoC: amd: Replace dpcm_playback/capture to playback/capture_assertion Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 05/23] ASoC: fsl: " Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 06/23] ASoC: sof: " Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 07/23] ASoC: meson: " Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 08/23] ASoC: Intel: " Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 09/23] ASoC: mediatek: " Kuninori Morimoto
2024-04-18 4:13 ` [PATCH v3 10/23] ASoC: soc-core: " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 11/23] ASoC: soc-topology: " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 12/23] ASoC: soc-compress: " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 13/23] ASoC: Intel: avs: boards: " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 14/23] ASoC: ti: Replace playback/capture_only " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 15/23] ASoC: amd: " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 16/23] ASoC: fsl: " Kuninori Morimoto
2024-04-18 4:14 ` [PATCH v3 17/23] ASoC: mxs: " Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 18/23] ASoC: atmel: " Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 19/23] ASoC: Intel: " Kuninori Morimoto
2024-04-18 11:19 ` Amadeusz Sławiński
2024-04-18 16:26 ` Pierre-Louis Bossart
2024-04-19 7:31 ` Amadeusz Sławiński
2024-04-18 4:15 ` [PATCH v3 20/23] ASoC: samsung: " Kuninori Morimoto
2024-04-18 4:15 ` [PATCH v3 21/23] ASoC: generic: " Kuninori Morimoto
2024-04-18 4:15 ` Kuninori Morimoto [this message]
2024-04-18 4:15 ` [PATCH v3 23/23] ASoC: doc: Replace dpcm_playback/capture " Kuninori Morimoto
2024-04-22 21:10 ` [PATCH v3 00/23] ASoC: " Pierre-Louis Bossart
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=87le5b71cn.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alexandre.belloni@bootlin.com \
--cc=alpernebiyasak@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bgoswami@quicinc.com \
--cc=brent.lu@intel.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=ckeepax@opensource.cirrus.com \
--cc=claudiu.beznea@tuxon.dev \
--cc=corbet@lwn.net \
--cc=cristian.ciocaltea@collabora.com \
--cc=daniel.baluta@nxp.com \
--cc=hdegoede@redhat.com \
--cc=imx@lists.linux.dev \
--cc=jbrunet@baylibre.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=khilman@baylibre.com \
--cc=lgirdwood@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=maso.huang@mediatek.com \
--cc=matthias.bgg@gmail.com \
--cc=me@jwang.link \
--cc=neil.armstrong@linaro.org \
--cc=nicolas.ferre@microchip.com \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=s.hauer@pengutronix.de \
--cc=s.nawrocki@samsung.com \
--cc=shawnguo@kernel.org \
--cc=shengjiu.wang@gmail.com \
--cc=srinivas.kandagatla@linaro.org \
--cc=tiwai@suse.com \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.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 read-only IMAP folder(s) and NNTP newsgroup(s).