* [PATCH 01/12] ALSA: pci: pcxhr: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 02/12] ALSA: pci: rme9652: " Kuninori Morimoto
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/pci/pcxhr/pcxhr_mix22.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/pcxhr/pcxhr_mix22.c b/sound/pci/pcxhr/pcxhr_mix22.c
index f340458fd2e11..e1435afc49074 100644
--- a/sound/pci/pcxhr/pcxhr_mix22.c
+++ b/sound/pci/pcxhr/pcxhr_mix22.c
@@ -535,7 +535,7 @@ int hr222_update_analog_audio_level(struct snd_pcxhr *chip,
{
dev_dbg(chip->card->dev,
"hr222_update_analog_audio_level(%s chan=%d)\n",
- is_capture ? "capture" : "playback", channel);
+ snd_pcm_direction_name(is_capture), channel);
if (is_capture) {
int level_l, level_r, level_mic;
/* we have to update all levels */
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 02/12] ALSA: pci: rme9652: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 01/12] ALSA: pci: pcxhr: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 03/12] ALSA: trace: " Kuninori Morimoto
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/pci/rme9652/hdspm.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 267c7848974ae..56d335f0e1960 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -5610,15 +5610,13 @@ static int snd_hdspm_hw_params(struct snd_pcm_substream *substream,
/*
dev_dbg(hdspm->card->dev,
"Allocated sample buffer for %s at 0x%08X\n",
- substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
- "playback" : "capture",
+ snd_pcm_direction_name(substream->stream),
snd_pcm_sgbuf_get_addr(substream, 0));
*/
/*
dev_dbg(hdspm->card->dev,
"set_hwparams: %s %d Hz, %d channels, bs = %d\n",
- substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
- "playback" : "capture",
+ snd_pcm_direction_name(substream->stream),
params_rate(params), params_channels(params),
params_buffer_size(params));
*/
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 03/12] ALSA: trace: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 01/12] ALSA: pci: pcxhr: " Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 02/12] ALSA: pci: rme9652: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 04/12] ALSA: aloop: " Kuninori Morimoto
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/trace/events/asoc.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index 202fc3680c366..6696dbcc2b96d 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -8,6 +8,7 @@
#include <linux/ktime.h>
#include <linux/tracepoint.h>
#include <sound/jack.h>
+#include <sound/pcm.h>
#define DAPM_DIRECT "(direct)"
#define DAPM_ARROW(dir) (((dir) == SND_SOC_DAPM_DIR_OUT) ? "->" : "<-")
@@ -212,7 +213,7 @@ TRACE_EVENT(snd_soc_dapm_connected,
),
TP_printk("%s: found %d paths",
- __entry->stream ? "capture" : "playback", __entry->paths)
+ snd_pcm_direction_name(__entry->stream), __entry->paths)
);
TRACE_EVENT(snd_soc_jack_irq,
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 04/12] ALSA: aloop: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (2 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 03/12] ALSA: trace: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 05/12] ALSA: pcm_timer: " Kuninori Morimoto
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/drivers/aloop.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c
index d6dd4b8c750ad..439d12ad87879 100644
--- a/sound/drivers/aloop.c
+++ b/sound/drivers/aloop.c
@@ -900,8 +900,7 @@ static void loopback_snd_timer_dpcm_info(struct loopback_pcm *dpcm,
cable->snd_timer.id.device,
cable->snd_timer.id.subdevice);
snd_iprintf(buffer, " timer open:\t\t%s\n",
- (cable->snd_timer.stream == SNDRV_PCM_STREAM_CAPTURE) ?
- "capture" : "playback");
+ snd_pcm_direction_name(cable->snd_timer.stream));
}
static snd_pcm_uframes_t loopback_pointer(struct snd_pcm_substream *substream)
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 05/12] ALSA: pcm_timer: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (3 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 04/12] ALSA: aloop: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 06/12] ASoC: stm: " Kuninori Morimoto
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/core/pcm_timer.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/core/pcm_timer.c b/sound/core/pcm_timer.c
index c43484b22b34c..ab0e5bd70f8fa 100644
--- a/sound/core/pcm_timer.c
+++ b/sound/core/pcm_timer.c
@@ -108,8 +108,7 @@ void snd_pcm_timer_init(struct snd_pcm_substream *substream)
if (snd_timer_new(substream->pcm->card, "PCM", &tid, &timer) < 0)
return;
sprintf(timer->name, "PCM %s %i-%i-%i",
- substream->stream == SNDRV_PCM_STREAM_CAPTURE ?
- "capture" : "playback",
+ snd_pcm_direction_name(substream->stream),
tid.card, tid.device, tid.subdevice);
timer->hw = snd_pcm_timer;
if (snd_device_register(timer->card, timer) < 0) {
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 06/12] ASoC: stm: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (4 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 05/12] ALSA: pcm_timer: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 07/12] ASoC: sof: pcm: " Kuninori Morimoto
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/stm/stm32_i2s.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index 46098e1111422..a96aa308681a2 100644
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -823,7 +823,7 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
/* Enable i2s */
dev_dbg(cpu_dai->dev, "start I2S %s\n",
- playback_flg ? "playback" : "capture");
+ snd_pcm_direction_name(substream->stream));
cfg1_mask = I2S_CFG1_RXDMAEN | I2S_CFG1_TXDMAEN;
regmap_update_bits(i2s->regmap, STM32_I2S_CFG1_REG,
@@ -869,7 +869,7 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
dev_dbg(cpu_dai->dev, "stop I2S %s\n",
- playback_flg ? "playback" : "capture");
+ snd_pcm_direction_name(substream->stream));
if (playback_flg)
regmap_update_bits(i2s->regmap, STM32_I2S_IER_REG,
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 07/12] ASoC: sof: pcm: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (5 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 06/12] ASoC: stm: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 08/12] ASoC: sof: intel: " Kuninori Morimoto
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sof/pcm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index baad4c1445aa7..35a7462d8b693 100644
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -100,7 +100,7 @@ sof_pcm_setup_connected_widgets(struct snd_sof_dev *sdev, struct snd_soc_pcm_run
dpcm_end_walk_at_be);
if (ret < 0) {
dev_err(sdev->dev, "error: dai %s has no valid %s path\n", dai->name,
- dir == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture");
+ snd_pcm_direction_name(dir));
return ret;
}
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 08/12] ASoC: sof: intel: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (6 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 07/12] ASoC: sof: pcm: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:05 ` [PATCH 09/12] ASoC: fsl: lpc3xxx-i2s: " Kuninori Morimoto
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sof/intel/hda-stream.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sound/soc/sof/intel/hda-stream.c b/sound/soc/sof/intel/hda-stream.c
index 8213debde497c..3ac63ce67ab1c 100644
--- a/sound/soc/sof/intel/hda-stream.c
+++ b/sound/soc/sof/intel/hda-stream.c
@@ -216,9 +216,7 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags)
/* stream found ? */
if (!hext_stream) {
- dev_err(sdev->dev, "error: no free %s streams\n",
- direction == SNDRV_PCM_STREAM_PLAYBACK ?
- "playback" : "capture");
+ dev_err(sdev->dev, "error: no free %s streams\n", snd_pcm_direction_name(direction));
return hext_stream;
}
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 09/12] ASoC: fsl: lpc3xxx-i2s: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (7 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 08/12] ASoC: sof: intel: " Kuninori Morimoto
@ 2024-07-30 2:05 ` Kuninori Morimoto
2024-07-30 2:06 ` [PATCH 10/12] ASoC: tegra: " Kuninori Morimoto
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:05 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/fsl/lpc3xxx-i2s.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/fsl/lpc3xxx-i2s.c b/sound/soc/fsl/lpc3xxx-i2s.c
index af995ca081a37..ddcbfe1f92a98 100644
--- a/sound/soc/fsl/lpc3xxx-i2s.c
+++ b/sound/soc/fsl/lpc3xxx-i2s.c
@@ -190,8 +190,7 @@ static int lpc3xxx_i2s_hw_params(struct snd_pcm_substream *substream,
__lpc3xxx_find_clkdiv(&clkx, &clky, i2s_info_p->freq, xfersize, i2s_info_p->clkrate);
- dev_dbg(dev, "Stream : %s\n",
- substream->stream == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture");
+ dev_dbg(dev, "Stream : %s\n", snd_pcm_direction_name(substream->stream));
dev_dbg(dev, "Desired clock rate : %d\n", i2s_info_p->freq);
dev_dbg(dev, "Base clock rate : %d\n", i2s_info_p->clkrate);
dev_dbg(dev, "Transfer size (bytes) : %d\n", xfersize);
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 10/12] ASoC: tegra: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (8 preceding siblings ...)
2024-07-30 2:05 ` [PATCH 09/12] ASoC: fsl: lpc3xxx-i2s: " Kuninori Morimoto
@ 2024-07-30 2:06 ` Kuninori Morimoto
2024-07-30 2:06 ` [PATCH 11/12] ASoC: soc-pcm: " Kuninori Morimoto
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:06 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/tegra/tegra210_i2s.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sound/soc/tegra/tegra210_i2s.c b/sound/soc/tegra/tegra210_i2s.c
index fe4fde844d861..e93ceb7afb4c4 100644
--- a/sound/soc/tegra/tegra210_i2s.c
+++ b/sound/soc/tegra/tegra210_i2s.c
@@ -85,7 +85,7 @@ static int tegra210_i2s_set_clock_rate(struct device *dev,
}
static int tegra210_i2s_sw_reset(struct snd_soc_component *compnt,
- bool is_playback)
+ int stream)
{
struct device *dev = compnt->dev;
struct tegra210_i2s *i2s = dev_get_drvdata(dev);
@@ -95,7 +95,7 @@ static int tegra210_i2s_sw_reset(struct snd_soc_component *compnt,
unsigned int cif_ctrl, stream_ctrl, i2s_ctrl, val;
int err;
- if (is_playback) {
+ if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
reset_reg = TEGRA210_I2S_RX_SOFT_RESET;
cif_reg = TEGRA210_I2S_RX_CIF_CTRL;
stream_reg = TEGRA210_I2S_RX_CTRL;
@@ -118,7 +118,7 @@ static int tegra210_i2s_sw_reset(struct snd_soc_component *compnt,
10, 10000);
if (err) {
dev_err(dev, "timeout: failed to reset I2S for %s\n",
- is_playback ? "playback" : "capture");
+ snd_pcm_direction_name(stream));
return err;
}
@@ -137,16 +137,16 @@ static int tegra210_i2s_init(struct snd_soc_dapm_widget *w,
struct device *dev = compnt->dev;
struct tegra210_i2s *i2s = dev_get_drvdata(dev);
unsigned int val, status_reg;
- bool is_playback;
+ int stream;
int err;
switch (w->reg) {
case TEGRA210_I2S_RX_ENABLE:
- is_playback = true;
+ stream = SNDRV_PCM_STREAM_PLAYBACK;
status_reg = TEGRA210_I2S_RX_STATUS;
break;
case TEGRA210_I2S_TX_ENABLE:
- is_playback = false;
+ stream = SNDRV_PCM_STREAM_CAPTURE;
status_reg = TEGRA210_I2S_TX_STATUS;
break;
default:
@@ -159,11 +159,11 @@ static int tegra210_i2s_init(struct snd_soc_dapm_widget *w,
10, 10000);
if (err) {
dev_err(dev, "timeout: previous I2S %s is still active\n",
- is_playback ? "playback" : "capture");
+ snd_pcm_direction_name(stream));
return err;
}
- return tegra210_i2s_sw_reset(compnt, is_playback);
+ return tegra210_i2s_sw_reset(compnt, stream);
}
static int __maybe_unused tegra210_i2s_runtime_suspend(struct device *dev)
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 11/12] ASoC: soc-pcm: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (9 preceding siblings ...)
2024-07-30 2:06 ` [PATCH 10/12] ASoC: tegra: " Kuninori Morimoto
@ 2024-07-30 2:06 ` Kuninori Morimoto
2024-07-30 2:06 ` [PATCH 12/12] ASoC: soc-dapm: " Kuninori Morimoto
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:06 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index bad823718ae47..5520944ac9ddc 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -222,7 +222,7 @@ static void dpcm_create_debugfs_state(struct snd_soc_dpcm *dpcm, int stream)
char *name;
name = kasprintf(GFP_KERNEL, "%s:%s", dpcm->be->dai_link->name,
- stream ? "capture" : "playback");
+ snd_pcm_direction_name(stream));
if (name) {
dpcm->debugfs_state = debugfs_create_dir(
name, dpcm->fe->debugfs_dpcm_root);
@@ -1278,7 +1278,7 @@ static int dpcm_be_connect(struct snd_soc_pcm_runtime *fe,
snd_soc_dpcm_stream_unlock_irq(fe, stream);
dev_dbg(fe->dev, "connected new DPCM %s path %s %s %s\n",
- stream ? "capture" : "playback", fe->dai_link->name,
+ snd_pcm_direction_name(stream), fe->dai_link->name,
stream ? "<-" : "->", be->dai_link->name);
dpcm_create_debugfs_state(dpcm, stream);
@@ -1306,7 +1306,7 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe,
continue;
dev_dbg(fe->dev, "reparent %s path %s %s %s\n",
- stream ? "capture" : "playback",
+ snd_pcm_direction_name(stream),
dpcm->fe->dai_link->name,
stream ? "<-" : "->", dpcm->be->dai_link->name);
@@ -1327,14 +1327,14 @@ void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream)
snd_soc_dpcm_stream_lock_irq(fe, stream);
for_each_dpcm_be_safe(fe, stream, dpcm, d) {
dev_dbg(fe->dev, "ASoC: BE %s disconnect check for %s\n",
- stream ? "capture" : "playback",
+ snd_pcm_direction_name(stream),
dpcm->be->dai_link->name);
if (dpcm->state != SND_SOC_DPCM_LINK_STATE_FREE)
continue;
dev_dbg(fe->dev, "freed DSP %s path %s %s %s\n",
- stream ? "capture" : "playback", fe->dai_link->name,
+ snd_pcm_direction_name(stream), fe->dai_link->name,
stream ? "<-" : "->", dpcm->be->dai_link->name);
/* BEs still alive need new FE */
@@ -1441,10 +1441,10 @@ int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
if (paths > 0)
dev_dbg(fe->dev, "ASoC: found %d audio %s paths\n", paths,
- stream ? "capture" : "playback");
+ snd_pcm_direction_name(stream));
else if (paths == 0)
dev_dbg(fe->dev, "ASoC: %s no valid %s path\n", fe->dai_link->name,
- stream ? "capture" : "playback");
+ snd_pcm_direction_name(stream));
return paths;
}
@@ -1487,7 +1487,7 @@ static int dpcm_prune_paths(struct snd_soc_pcm_runtime *fe, int stream,
continue;
dev_dbg(fe->dev, "ASoC: pruning %s BE %s for %s\n",
- stream ? "capture" : "playback",
+ snd_pcm_direction_name(stream),
dpcm->be->dai_link->name, fe->dai_link->name);
dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE;
dpcm_set_be_update_state(dpcm->be, stream, SND_SOC_DPCM_UPDATE_BE);
@@ -1605,7 +1605,7 @@ void dpcm_be_dai_stop(struct snd_soc_pcm_runtime *fe, int stream,
if (be->dpcm[stream].users == 0) {
dev_err(be->dev, "ASoC: no users %s at close - state %d\n",
- stream ? "capture" : "playback",
+ snd_pcm_direction_name(stream),
be->dpcm[stream].state);
continue;
}
@@ -1645,7 +1645,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
if (!be_substream) {
dev_err(be->dev, "ASoC: no backend %s stream\n",
- stream ? "capture" : "playback");
+ snd_pcm_direction_name(stream));
continue;
}
@@ -1656,7 +1656,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
/* first time the dpcm is open ? */
if (be->dpcm[stream].users == DPCM_MAX_BE_USERS) {
dev_err(be->dev, "ASoC: too many users %s at open %d\n",
- stream ? "capture" : "playback",
+ snd_pcm_direction_name(stream),
be->dpcm[stream].state);
continue;
}
@@ -1669,7 +1669,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
continue;
dev_dbg(be->dev, "ASoC: open %s BE %s\n",
- stream ? "capture" : "playback", be->dai_link->name);
+ snd_pcm_direction_name(stream), be->dai_link->name);
be_substream->runtime = fe_substream->runtime;
err = __soc_pcm_open(be, be_substream);
@@ -1677,7 +1677,7 @@ int dpcm_be_dai_startup(struct snd_soc_pcm_runtime *fe, int stream)
be->dpcm[stream].users--;
if (be->dpcm[stream].users < 0)
dev_err(be->dev, "ASoC: no users %s at unwind %d\n",
- stream ? "capture" : "playback",
+ snd_pcm_direction_name(stream),
be->dpcm[stream].state);
be->dpcm[stream].state = SND_SOC_DPCM_STATE_CLOSE;
@@ -2531,7 +2531,7 @@ static int dpcm_run_update_shutdown(struct snd_soc_pcm_runtime *fe, int stream)
int err;
dev_dbg(fe->dev, "ASoC: runtime %s close on FE %s\n",
- stream ? "capture" : "playback", fe->dai_link->name);
+ snd_pcm_direction_name(stream), fe->dai_link->name);
if (trigger == SND_SOC_DPCM_TRIGGER_BESPOKE) {
/* call bespoke trigger - FE takes care of all BE triggers */
@@ -2565,7 +2565,7 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)
int ret = 0;
dev_dbg(fe->dev, "ASoC: runtime %s open on FE %s\n",
- stream ? "capture" : "playback", fe->dai_link->name);
+ snd_pcm_direction_name(stream), fe->dai_link->name);
/* Only start the BE if the FE is ready */
if (fe->dpcm[stream].state == SND_SOC_DPCM_STATE_HW_FREE ||
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 12/12] ASoC: soc-dapm: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (10 preceding siblings ...)
2024-07-30 2:06 ` [PATCH 11/12] ASoC: soc-pcm: " Kuninori Morimoto
@ 2024-07-30 2:06 ` Kuninori Morimoto
2024-08-01 10:48 ` [PATCH 00/12] ALSA/ASoC: " Takashi Iwai
2024-08-02 17:35 ` (subset) " Mark Brown
13 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2024-07-30 2:06 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai; +Cc: Linux-ALSA
We already have snd_pcm_direction_name(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-dapm.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 37dccd9c1ba01..d7d6dbb9d9eae 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -2751,8 +2751,7 @@ static int dapm_update_dai_unlocked(struct snd_pcm_substream *substream,
if (!w)
return 0;
- dev_dbg(dai->dev, "Update DAI routes for %s %s\n", dai->name,
- dir == SNDRV_PCM_STREAM_PLAYBACK ? "playback" : "capture");
+ dev_dbg(dai->dev, "Update DAI routes for %s %s\n", dai->name, snd_pcm_direction_name(dir));
snd_soc_dapm_widget_for_each_sink_path(w, p) {
ret = dapm_update_dai_chan(p, p->sink, channels);
--
2.43.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (11 preceding siblings ...)
2024-07-30 2:06 ` [PATCH 12/12] ASoC: soc-dapm: " Kuninori Morimoto
@ 2024-08-01 10:48 ` Takashi Iwai
2024-08-02 17:35 ` (subset) " Mark Brown
13 siblings, 0 replies; 15+ messages in thread
From: Takashi Iwai @ 2024-08-01 10:48 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Mark Brown, Linux-ALSA
On Tue, 30 Jul 2024 04:04:43 +0200,
Kuninori Morimoto wrote:
>
>
> Hi Tatasi, Mark
>
> Many drivers are selecting strings "playback" / "capture" by own
> handling, but we have snd_pcm_direction_name() function for it.
> This patch use it.
>
> One note is that snd_pcm_direction_name() will select
> "Playback" and "Capture", instead of "playback" / "capture".
> Almost all drivers are using it as dev_dbg() or dev_err()
> so no problem. But some other drivers are using it as other
> purpose. It might be issue (?). For example ASoC debugfs dir name
> will be changed by this patch.
>
> Kuninori Morimoto (12):
> ALSA: pci: pcxhr: use snd_pcm_direction_name()
> ALSA: pci: rme9652: use snd_pcm_direction_name()
> ALSA: trace: use snd_pcm_direction_name()
> ALSA: aloop: use snd_pcm_direction_name()
> ALSA: pcm_timer: use snd_pcm_direction_name()
> ASoC: stm: use snd_pcm_direction_name()
> ASoC: sof: pcm: use snd_pcm_direction_name()
> ASoC: sof: intel: use snd_pcm_direction_name()
> ASoC: fsl: lpc3xxx-i2s: use snd_pcm_direction_name()
> ASoC: tegra: use snd_pcm_direction_name()
> ASoC: soc-pcm: use snd_pcm_direction_name()
> ASoC: soc-dapm: use snd_pcm_direction_name()
Applied from patch 1 to 5 to for-next branch.
I leave the rest for ASoC to Mark.
thanks,
Takashi
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: (subset) [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name()
2024-07-30 2:04 [PATCH 00/12] ALSA/ASoC: use snd_pcm_direction_name() Kuninori Morimoto
` (12 preceding siblings ...)
2024-08-01 10:48 ` [PATCH 00/12] ALSA/ASoC: " Takashi Iwai
@ 2024-08-02 17:35 ` Mark Brown
13 siblings, 0 replies; 15+ messages in thread
From: Mark Brown @ 2024-08-02 17:35 UTC (permalink / raw)
To: Takashi Iwai, Kuninori Morimoto; +Cc: Linux-ALSA
On Tue, 30 Jul 2024 02:04:43 +0000, Kuninori Morimoto wrote:
> Many drivers are selecting strings "playback" / "capture" by own
> handling, but we have snd_pcm_direction_name() function for it.
> This patch use it.
>
> One note is that snd_pcm_direction_name() will select
> "Playback" and "Capture", instead of "playback" / "capture".
> Almost all drivers are using it as dev_dbg() or dev_err()
> so no problem. But some other drivers are using it as other
> purpose. It might be issue (?). For example ASoC debugfs dir name
> will be changed by this patch.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[06/12] ASoC: stm: use snd_pcm_direction_name()
commit: 7dfdcde20179383d4acfee61692a22955d5a8217
[07/12] ASoC: sof: pcm: use snd_pcm_direction_name()
commit: cda4aa0069b73e3404ee61864b4814ccc7b7a6ad
[08/12] ASoC: sof: intel: use snd_pcm_direction_name()
commit: baa779902020d8921cf652944309d1284a63811c
[09/12] ASoC: fsl: lpc3xxx-i2s: use snd_pcm_direction_name()
commit: 8156921e620827319460e8daa9831d731b0d75fd
[10/12] ASoC: tegra: use snd_pcm_direction_name()
commit: d6db65bc62fd19915a9926e08b9cbcfbadd64291
[11/12] ASoC: soc-pcm: use snd_pcm_direction_name()
commit: ebbd6703d4635d36b35f12a1365dfd7894c0ff12
[12/12] ASoC: soc-dapm: use snd_pcm_direction_name()
commit: bb660132868b5208d6a5f2bd184425cf788f4ef9
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 15+ messages in thread