ASoC: uniphier: Use guard() for spin locks
Subsystems (4)
cover ASoC: uniphier: Use guard() for spin locks
From: bui duc phuc <[email protected]>
Hi all,
This series converts spin lock handling in UniPhier AIO drivers to use guard() helpers.
The changes are purely code cleanups with no functional impact.
Best regards,
Phuc
bui duc phuc (2):
ASoC: uniphier: aio-compress: Use guard() for spin locks
ASoC: uniphier: aio-dma: Use guard() for spin locks
sound/soc/uniphier/aio-compress.c | 24 +++++--------- sound/soc/uniphier/aio-dma.c | 52 ++++++++++++++----------------- 2 files changed, 30 insertions(+), 46 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 ASoC: uniphier: aio-compress: Use guard() for spin locks
From: bui duc phuc <[email protected]>
Clean up the code using guard() for spin locks.
Merely code refactoring, and no behavior change.
--- sound/soc/uniphier/aio-compress.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-)
sound/soc/uniphier/aio-compress.c +7 -17
@@ -183,18 +183,16 @@ static int uniphier_aio_compr_prepare(struct snd_soc_component *component,struct uniphier_aio *aio =uniphier_priv (snd_soc_rtd_to_cpu (rtd,0 ));struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];int bytes = runtime->fragment_size; -unsigned long flags;int ret; ret =aiodma_ch_set_param (sub);if (ret)return ret; -spin_lock_irqsave (&sub->lock, flags); - ret =aiodma_rb_set_buffer (sub, sub->compr_addr, - sub->compr_addr + sub->compr_bytes, - bytes); -spin_unlock_irqrestore (&sub->lock, flags); +scoped_guard (spinlock_irqsave, &sub->lock) + ret = aiodma_rb_set_buffer(sub, sub->compr_addr, + sub->compr_addr + sub->compr_bytes, + bytes);if (ret)return ret;
@@ -223,9 +221,8 @@ static int uniphier_aio_compr_trigger(struct snd_soc_component *component,struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];struct device *dev = &aio->chip->pdev->dev;int bytes = runtime->fragment_size, ret =0 ; -unsigned long flags; -spin_lock_irqsave (&sub->lock, flags); +guard (spinlock_irqsave)(&sub->lock);switch (cmd) {case SNDRV_PCM_TRIGGER_START :aiodma_rb_sync (sub, sub->compr_addr, sub->compr_bytes, bytes);
@@ -242,7 +239,6 @@ static int uniphier_aio_compr_trigger(struct snd_soc_component *component,dev_warn (dev,"Unknown trigger(%d)\n" , cmd); ret = -EINVAL ; } -spin_unlock_irqrestore (&sub->lock, flags);return ret; }
@@ -256,10 +252,9 @@ static int uniphier_aio_compr_pointer(struct snd_soc_component *component,struct uniphier_aio *aio =uniphier_priv (snd_soc_rtd_to_cpu (rtd,0 ));struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];int bytes = runtime->fragment_size; -unsigned long flags;u32 pos; -spin_lock_irqsave (&sub->lock, flags); +guard (spinlock_irqsave)(&sub->lock);aiodma_rb_sync (sub, sub->compr_addr, sub->compr_bytes, bytes);
@@ -273,8 +268,6 @@ static int uniphier_aio_compr_pointer(struct snd_soc_component *component, } tstamp->byte_offset = pos; -spin_unlock_irqrestore (&sub->lock, flags); -return 0 ; }
@@ -332,7 +325,6 @@ static int uniphier_aio_compr_copy(struct snd_soc_component *component,struct uniphier_aio_sub *sub = &aio->sub[cstream->direction];size_t cnt =min_t (size_t, count,aio_rb_space_to_end (sub) /2 );int bytes = runtime->fragment_size; -unsigned long flags;size_t s;int ret;
@@ -360,7 +352,7 @@ static int uniphier_aio_compr_copy(struct snd_soc_component *component,if (ret)return -EFAULT ; -spin_lock_irqsave (&sub->lock, flags); +guard (spinlock_irqsave)(&sub->lock); sub->threshold =2 * bytes;aiodma_rb_set_threshold (sub, sub->compr_bytes,2 * bytes);
@@ -376,8 +368,6 @@ static int uniphier_aio_compr_copy(struct snd_soc_component *component, }aiodma_rb_sync (sub, sub->compr_addr, sub->compr_bytes, bytes); -spin_unlock_irqrestore (&sub->lock, flags); -return cnt; }
Signature · 1 line
2.43.0
PATCH 2/2 ASoC: uniphier: aio-dma: Use guard() for spin locks
In reply to [email protected]From: bui duc phuc <[email protected]>
Clean up the code using guard() for spin locks.
Merely code refactoring, and no behavior change.
--- sound/soc/uniphier/aio-dma.c | 52 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 29 deletions(-)
sound/soc/uniphier/aio-dma.c +23 -29
@@ -32,15 +32,15 @@ static void aiodma_pcm_irq(struct uniphier_aio_sub *sub) runtime->channels *samples_to_bytes (runtime,1 );int ret; -spin_lock (&sub->lock); - ret =aiodma_rb_set_threshold (sub, runtime->dma_bytes, - sub->threshold + bytes); -if (!ret) - sub->threshold += bytes; - -aiodma_rb_sync (sub, runtime->dma_addr, runtime->dma_bytes, bytes); -aiodma_rb_clear_irq (sub); -spin_unlock (&sub->lock); + scoped_guard(spinlock, &sub->lock) { + ret =aiodma_rb_set_threshold (sub, runtime->dma_bytes, + sub->threshold + bytes); +if (!ret) + sub->threshold += bytes; + +aiodma_rb_sync (sub, runtime->dma_addr, runtime->dma_bytes, bytes); +aiodma_rb_clear_irq (sub); + }snd_pcm_period_elapsed (sub->substream); }
@@ -51,15 +51,15 @@ static void aiodma_compr_irq(struct uniphier_aio_sub *sub)int bytes = runtime->fragment_size;int ret; -spin_lock (&sub->lock); - ret =aiodma_rb_set_threshold (sub, sub->compr_bytes, - sub->threshold + bytes); -if (!ret) - sub->threshold += bytes; + scoped_guard(spinlock, &sub->lock) { + ret =aiodma_rb_set_threshold (sub, sub->compr_bytes, + sub->threshold + bytes); +if (!ret) + sub->threshold += bytes; -aiodma_rb_sync (sub, sub->compr_addr, sub->compr_bytes, bytes); -aiodma_rb_clear_irq (sub); -spin_unlock (&sub->lock); +aiodma_rb_sync (sub, sub->compr_addr, sub->compr_bytes, bytes); +aiodma_rb_clear_irq (sub); + }snd_compr_fragment_elapsed (sub->cstream); }
@@ -113,18 +113,16 @@ static int uniphier_aiodma_prepare(struct snd_soc_component *component,struct uniphier_aio_sub *sub = &aio->sub[substream->stream];int bytes = runtime->period_size * runtime->channels *samples_to_bytes (runtime,1 ); -unsigned long flags;int ret; ret =aiodma_ch_set_param (sub);if (ret)return ret; -spin_lock_irqsave (&sub->lock, flags); - ret =aiodma_rb_set_buffer (sub, runtime->dma_addr, - runtime->dma_addr + runtime->dma_bytes, - bytes); -spin_unlock_irqrestore (&sub->lock, flags); +scoped_guard (spinlock_irqsave, &sub->lock) + ret = aiodma_rb_set_buffer(sub, runtime->dma_addr, + runtime->dma_addr + runtime->dma_bytes, + bytes);if (ret)return ret;
@@ -141,9 +139,8 @@ static int uniphier_aiodma_trigger(struct snd_soc_component *component,struct device *dev = &aio->chip->pdev->dev;int bytes = runtime->period_size * runtime->channels *samples_to_bytes (runtime,1 ); -unsigned long flags; -spin_lock_irqsave (&sub->lock, flags); +guard (spinlock_irqsave)(&sub->lock);switch (cmd) {case SNDRV_PCM_TRIGGER_START : aiodma_rb_sync(sub, runtime->dma_addr, runtime->dma_bytes,
@@ -161,7 +158,6 @@ static int uniphier_aiodma_trigger(struct snd_soc_component *component,dev_warn (dev,"Unknown trigger(%d) ignored\n" , cmd);break ; } -spin_unlock_irqrestore (&sub->lock, flags);return 0 ; }
@@ -176,17 +172,15 @@ static snd_pcm_uframes_t uniphier_aiodma_pointer(struct uniphier_aio_sub *sub = &aio->sub[substream->stream];int bytes = runtime->period_size * runtime->channels *samples_to_bytes (runtime,1 ); -unsigned long flags;snd_pcm_uframes_t pos; -spin_lock_irqsave (&sub->lock, flags); +guard (spinlock_irqsave)(&sub->lock);aiodma_rb_sync (sub, runtime->dma_addr, runtime->dma_bytes, bytes);if (sub->swm->dir ==PORT_DIR_OUTPUT ) pos =bytes_to_frames (runtime, sub->rd_offs);else pos =bytes_to_frames (runtime, sub->wr_offs); -spin_unlock_irqrestore (&sub->lock, flags);return pos; }
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 11 lines · On Wed, 29 Apr 2026 16:16:12 +0700, [email protected] wrote:
ASoC: uniphier: Use
guard()for spin locksFrom: bui duc phuc <[email protected]>
Hi all,
This series converts spin lock handling in UniPhier AIO drivers to use
guard()helpers.
The changes are purely code cleanups with no functional impact.[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.2
Thanks!
[1/2] ASoC: uniphier: aio-compress: Use guard() for spin locks
https://git.kernel.org/broonie/sound/c/55f8c382858d [2/2] ASoC: uniphier: aio-dma: Use guard() for spin locks https://git.kernel.org/broonie/sound/c/8f7e9d3c0cca
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