From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-staging@lists.linux.dev,
Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 048/113] ASoC: dwc: use snd_pcm_is_playback/capture()
Date: Mon, 5 Aug 2024 00:39:04 +0000 [thread overview]
Message-ID: <877ccvztuf.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <874j7z3j1a.wl-kuninori.morimoto.gx@renesas.com>
We can use snd_pcm_is_playback/capture(). Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/dwc/dwc-i2s.c | 20 ++++++++++----------
sound/soc/dwc/dwc-pcm.c | 6 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c
index c04466f5492e9..874d5bf2985e6 100644
--- a/sound/soc/dwc/dwc-i2s.c
+++ b/sound/soc/dwc/dwc-i2s.c
@@ -42,7 +42,7 @@ static inline void i2s_disable_channels(struct dw_i2s_dev *dev, u32 stream)
{
u32 i = 0;
- if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(stream)) {
for (i = 0; i < 4; i++)
i2s_write_reg(dev->i2s_base, TER(i), 0);
} else {
@@ -55,7 +55,7 @@ static inline void i2s_clear_irqs(struct dw_i2s_dev *dev, u32 stream)
{
u32 i = 0;
- if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(stream)) {
for (i = 0; i < 4; i++)
i2s_read_reg(dev->i2s_base, TOR(i));
} else {
@@ -69,7 +69,7 @@ static inline void i2s_disable_irqs(struct dw_i2s_dev *dev, u32 stream,
{
u32 i, irq;
- if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(stream)) {
for (i = 0; i < (chan_nr / 2); i++) {
irq = i2s_read_reg(dev->i2s_base, IMR(i));
i2s_write_reg(dev->i2s_base, IMR(i), irq | 0x30);
@@ -87,7 +87,7 @@ static inline void i2s_enable_irqs(struct dw_i2s_dev *dev, u32 stream,
{
u32 i, irq;
- if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(stream)) {
for (i = 0; i < (chan_nr / 2); i++) {
irq = i2s_read_reg(dev->i2s_base, IMR(i));
i2s_write_reg(dev->i2s_base, IMR(i), irq & ~0x30);
@@ -156,7 +156,7 @@ static void i2s_enable_dma(struct dw_i2s_dev *dev, u32 stream)
u32 dma_reg = i2s_read_reg(dev->i2s_base, I2S_DMACR);
/* Enable DMA handshake for stream */
- if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+ if (snd_pcm_is_playback(stream))
dma_reg |= I2S_DMAEN_TXBLOCK;
else
dma_reg |= I2S_DMAEN_RXBLOCK;
@@ -169,7 +169,7 @@ static void i2s_disable_dma(struct dw_i2s_dev *dev, u32 stream)
u32 dma_reg = i2s_read_reg(dev->i2s_base, I2S_DMACR);
/* Disable DMA handshake for stream */
- if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(stream)) {
dma_reg &= ~I2S_DMAEN_TXBLOCK;
i2s_write_reg(dev->i2s_base, I2S_RTXDMA, 1);
} else {
@@ -194,7 +194,7 @@ static void i2s_start(struct dw_i2s_dev *dev,
i2s_write_reg(dev->i2s_base, IER, reg);
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ if (snd_pcm_is_playback(substream))
i2s_write_reg(dev->i2s_base, ITER, 1);
else
i2s_write_reg(dev->i2s_base, IRER, 1);
@@ -213,7 +213,7 @@ static void i2s_stop(struct dw_i2s_dev *dev,
{
i2s_clear_irqs(dev, substream->stream);
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ if (snd_pcm_is_playback(substream))
i2s_write_reg(dev->i2s_base, ITER, 0);
else
i2s_write_reg(dev->i2s_base, IRER, 0);
@@ -253,7 +253,7 @@ static void dw_i2s_config(struct dw_i2s_dev *dev, int stream)
i2s_disable_channels(dev, stream);
for (ch_reg = 0; ch_reg < (config->chan_nr / 2); ch_reg++) {
- if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(stream)) {
i2s_write_reg(dev->i2s_base, TCR(ch_reg),
dev->xfer_resolution);
i2s_write_reg(dev->i2s_base, TFCR(ch_reg),
@@ -352,7 +352,7 @@ static int dw_i2s_prepare(struct snd_pcm_substream *substream,
{
struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ if (snd_pcm_is_playback(substream))
i2s_write_reg(dev->i2s_base, TXFFR, 1);
else
i2s_write_reg(dev->i2s_base, RXFFR, 1);
diff --git a/sound/soc/dwc/dwc-pcm.c b/sound/soc/dwc/dwc-pcm.c
index a418265c030a5..673218e010607 100644
--- a/sound/soc/dwc/dwc-pcm.c
+++ b/sound/soc/dwc/dwc-pcm.c
@@ -200,7 +200,7 @@ static int dw_pcm_trigger(struct snd_soc_component *component,
case SNDRV_PCM_TRIGGER_START:
case SNDRV_PCM_TRIGGER_RESUME:
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ if (snd_pcm_is_playback(substream)) {
WRITE_ONCE(dev->tx_ptr, 0);
rcu_assign_pointer(dev->tx_substream, substream);
} else {
@@ -211,7 +211,7 @@ static int dw_pcm_trigger(struct snd_soc_component *component,
case SNDRV_PCM_TRIGGER_STOP:
case SNDRV_PCM_TRIGGER_SUSPEND:
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ if (snd_pcm_is_playback(substream))
rcu_assign_pointer(dev->tx_substream, NULL);
else
rcu_assign_pointer(dev->rx_substream, NULL);
@@ -231,7 +231,7 @@ static snd_pcm_uframes_t dw_pcm_pointer(struct snd_soc_component *component,
struct dw_i2s_dev *dev = runtime->private_data;
snd_pcm_uframes_t pos;
- if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+ if (snd_pcm_is_playback(substream))
pos = READ_ONCE(dev->tx_ptr);
else
pos = READ_ONCE(dev->rx_ptr);
--
2.43.0
next prev parent reply other threads:[~2024-08-05 0:39 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-05 0:33 [PATCH 000/113] ALSA: add snd_pcm_is_playback/capture() macro Kuninori Morimoto
2024-08-05 0:33 ` [PATCH 001/113] " Kuninori Morimoto
2024-08-05 0:34 ` [PATCH 002/113] slimbus: stream: use snd_pcm_is_playback/capture() Kuninori Morimoto
2024-08-05 0:34 ` [PATCH 003/113] staging: greybus: " Kuninori Morimoto
2024-08-05 0:34 ` [PATCH 004/113] soundwire: amd: " Kuninori Morimoto
2024-08-05 0:34 ` [PATCH 005/113] soundwire: qcom: " Kuninori Morimoto
2024-08-05 0:34 ` [PATCH 006/113] soundwire: intel: " Kuninori Morimoto
2024-08-05 0:34 ` [PATCH 007/113] soundwire: stream: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 008/113] usb: gadget: use for_each_pcm_streams() Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 009/113] usb: gadget: use snd_pcm_is_playback/capture() Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 010/113] ALSA: isa: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 011/113] ALSA: arm: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 012/113] ALSA: xen: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 013/113] ALSA: usb: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 014/113] ALSA: pci: hda: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 015/113] ALSA: pci: ac97: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 016/113] ALSA: pci: nm256: " Kuninori Morimoto
2024-08-05 0:35 ` [PATCH 017/113] ALSA: pci: pcxhr: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 018/113] ALSA: pci: asihpi: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 019/113] ALSA: pci: au88x0: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 020/113] ALSA: pci: ca0106: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 021/113] ALSA: pci: mixart: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 022/113] ALSA: pci: emu10k1: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 023/113] ALSA: pci: ice1712: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 024/113] ALSA: pci: rme9652: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 025/113] ALSA: pci: korg1212: " Kuninori Morimoto
2024-08-05 0:36 ` [PATCH 026/113] ALSA: pci: lx6464es: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 027/113] ALSA: pci: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 028/113] ALSA: ppc: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 029/113] ALSA: mips: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 030/113] ALSA: core: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 031/113] ALSA: core: oss: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 032/113] ALSA: virtio: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 033/113] ALSA: include: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 034/113] ALSA: drivers: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 035/113] ALSA: firewire: motu: " Kuninori Morimoto
2024-08-05 0:37 ` [PATCH 036/113] ALSA: firewire: oxfw: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 037/113] ALSA: firewire: dice: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 038/113] ALSA: firewire: bebob: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 039/113] ALSA: firewire: tascam: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 040/113] ALSA: firewire: digi00x: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 041/113] ALSA: firewire: fireface: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 042/113] ALSA: firewire: fireworks: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 043/113] ASoC: ti: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 044/113] ASoC: sh: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 045/113] ASoC: adi: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 046/113] ASoC: amd: " Kuninori Morimoto
2024-08-05 0:38 ` [PATCH 047/113] ASoC: bcm: " Kuninori Morimoto
2024-08-05 0:39 ` Kuninori Morimoto [this message]
2024-08-05 0:39 ` [PATCH 049/113] ASoC: fsl: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 050/113] ASoC: mxs: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 051/113] ASoC: pxa: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 052/113] ASoC: sti: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 053/113] ASoC: stm: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 054/113] ASoC: sof: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 055/113] ASoC: sof: intel: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 056/113] ASoC: qcom: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 057/113] ASoC: sprd: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 058/113] ASoC: au1x: " Kuninori Morimoto
2024-08-05 0:39 ` [PATCH 059/113] ASoC: apple: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 060/113] ASoC: atmel: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 061/113] ASoC: intel: avs: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 062/113] ASoC: intel: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 063/113] ASoC: soc-*: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 064/113] ASoC: spear: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 065/113] ASoC: sunxi: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 066/113] ASoC: tegra: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 067/113] ASoC: ux500: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 068/113] ASoC: cirrus: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 069/113] ASoC: google: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 070/113] ASoC: jz4740: " Kuninori Morimoto
2024-08-05 0:40 ` [PATCH 071/113] ASoC: xilinx: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 072/113] ASoC: codecs: cs*: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 073/113] ASoC: codecs: rt*: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 074/113] ASoC: codecs: wm*: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 075/113] ASoC: codecs: ac97: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 076/113] ASoC: codecs: cpcap: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 077/113] ASoC: codecs: es83xx: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 078/113] ASoC: codecs: ad193x: " Kuninori Morimoto
2024-08-05 0:41 ` [PATCH 079/113] ASoC: codecs: ak46xx: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 080/113] ASoC: codecs: jz47xx: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 081/113] ASoC: codecs: mt635x: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 082/113] ASoC: codecs: sta529: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 083/113] ASoC: codecs: rk3308: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 084/113] ASoC: codecs: wl1273: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 085/113] ASoC: codecs: mc13783: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 086/113] ASoC: codecs: nau882x: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 087/113] ASoC: codecs: peb2466: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 088/113] ASoC: codecs: sma1303: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 089/113] ASoC: codecs: adav80x: " Kuninori Morimoto
2024-08-05 0:42 ` [PATCH 090/113] ASoC: codecs: twl4030: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 091/113] ASoC: codecs: uda1380: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 092/113] ASoC: codecs: wcd93xx: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 093/113] ASoC: codecs: zl38060: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 094/113] ASoC: codecs: adau17xx: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 095/113] ASoC: codecs: hdac_hda: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 096/113] ASoC: codecs: max983xx: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 097/113] ASoC: codecs: sgtl5000: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 098/113] ASoC: codecs: stac9766: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 099/113] ASoC: codecs: tscs4xxx: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 100/113] ASoC: codecs: idt821034: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 101/113] ASoC: codecs: sdw-mockup: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 102/113] ASoC: codecs: hdmi-codec: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 103/113] ASoC: codecs: tlv320aic23: " Kuninori Morimoto
2024-08-05 0:43 ` [PATCH 104/113] ASoC: codecs: framer-codec: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 105/113] ASoC: samsung: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 106/113] ASoC: kirkwood: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 107/113] ASoC: loongson: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 108/113] ASoC: mediatek: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 109/113] ASoC: rockchip: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 110/113] ASoC: starfive: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 111/113] ASoC: uniphier: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 112/113] ASoC: hisilicon: " Kuninori Morimoto
2024-08-05 0:44 ` [PATCH 113/113] ASoC: sdw_utils: " Kuninori Morimoto
2024-08-05 10:43 ` [PATCH 000/113] ALSA: add snd_pcm_is_playback/capture() macro Mark Brown
2024-08-05 14:04 ` Jaroslav Kysela
2024-08-05 19:37 ` Mark Brown
2024-09-13 1:35 ` Kuninori Morimoto
2024-09-13 7:14 ` Takashi Iwai
2024-09-16 23:41 ` 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=877ccvztuf.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-staging@lists.linux.dev \
--cc=linux-usb@vger.kernel.org \
/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