ASoC: rockchip: i2s-tdm: 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/20260604033554.96996-3-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/rockchip/rockchip_i2s_tdm.c b/sound/soc/rockchip/rockchip_i2s_tdm.c
index fc52149ed6ae3e36ccba422f96eedcf85bd97f60..3f3db28b89404f134700285c33bf271a953d5f72 100644 (file)
--- a/sound/soc/rockchip/rockchip_i2s_tdm.c
+++ b/sound/soc/rockchip/rockchip_i2s_tdm.c
@@ -285,9 +285,8 @@ static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream,
                                  struct snd_soc_dai *dai, int on)
 {
        struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai);
-       unsigned long flags;
 
-       spin_lock_irqsave(&i2s_tdm->lock, flags);
+       guard(spinlock_irqsave)(&i2s_tdm->lock);
        if (on) {
                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
                        rockchip_enable_tde(i2s_tdm->regmap);
@@ -313,7 +312,6 @@ static void rockchip_snd_txrxctrl(struct snd_pcm_substream *substream,
                                                I2S_CLR_TXC | I2S_CLR_RXC);
                }
        }
-       spin_unlock_irqrestore(&i2s_tdm->lock, flags);
 }
 
 static void rockchip_snd_txctrl(struct rk_i2s_tdm_dev *i2s_tdm, int on)
@@ -587,12 +585,11 @@ static int rockchip_i2s_trcm_mode(struct snd_pcm_substream *substream,
                                  unsigned int fmt)
 {
        struct rk_i2s_tdm_dev *i2s_tdm = to_info(dai);
-       unsigned long flags;
 
        if (!i2s_tdm->clk_trcm)
                return 0;
 
-       spin_lock_irqsave(&i2s_tdm->lock, flags);
+       guard(spinlock_irqsave)(&i2s_tdm->lock);
        if (i2s_tdm->refcount)
                rockchip_i2s_tdm_xfer_pause(substream, i2s_tdm);
 
@@ -614,7 +611,6 @@ static int rockchip_i2s_trcm_mode(struct snd_pcm_substream *substream,
 
        if (i2s_tdm->refcount)
                rockchip_i2s_tdm_xfer_resume(substream, i2s_tdm);
-       spin_unlock_irqrestore(&i2s_tdm->lock, flags);
 
        return 0;
 }