ASoC: uniphier: aio-compress: Use guard() for spin locks

Clean up the code using guard() for spin locks.
Merely code refactoring, and no behavior change.

Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260429091614.96667-2-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/uniphier/aio-compress.c b/sound/soc/uniphier/aio-compress.c
index b18af98a552b752140035418b7bf95de161e34de..57247a03b5c9ec443bd756282c0280a8a84db663 100644 (file)
--- a/sound/soc/uniphier/aio-compress.c
+++ b/sound/soc/uniphier/aio-compress.c
@@ -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;
 }