From: bui duc phuc Date: Wed, 10 Jun 2026 10:20:20 +0000 (+0700) Subject: ASoC: mediatek: mt8195: mt8365-dai-adda: Use guard() for spin locks X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=754c2fbf8bbc2d76006fc0f69eeee956c262aeed;p=thirdparty%2Flinux.git ASoC: mediatek: mt8195: mt8365-dai-adda: 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 Link: https://patch.msgid.link/20260610102021.83273-10-phucduc.bui@gmail.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/mediatek/mt8365/mt8365-dai-adda.c b/sound/soc/mediatek/mt8365/mt8365-dai-adda.c index a04c24bbfcff..d8eda9e17eb8 100644 --- a/sound/soc/mediatek/mt8365/mt8365-dai-adda.c +++ b/sound/soc/mediatek/mt8365/mt8365-dai-adda.c @@ -63,10 +63,9 @@ static int mt8365_dai_set_adda_in(struct mtk_base_afe *afe, unsigned int rate) int mt8365_dai_enable_adda_on(struct mtk_base_afe *afe) { - unsigned long flags; struct mt8365_afe_private *afe_priv = afe->platform_priv; - spin_lock_irqsave(&afe_priv->afe_ctrl_lock, flags); + guard(spinlock_irqsave)(&afe_priv->afe_ctrl_lock); adda_afe_on_ref_cnt++; if (adda_afe_on_ref_cnt == 1) @@ -74,17 +73,14 @@ int mt8365_dai_enable_adda_on(struct mtk_base_afe *afe) AFE_ADDA_UL_DL_ADDA_AFE_ON, AFE_ADDA_UL_DL_ADDA_AFE_ON); - spin_unlock_irqrestore(&afe_priv->afe_ctrl_lock, flags); - return 0; } int mt8365_dai_disable_adda_on(struct mtk_base_afe *afe) { - unsigned long flags; struct mt8365_afe_private *afe_priv = afe->platform_priv; - spin_lock_irqsave(&afe_priv->afe_ctrl_lock, flags); + guard(spinlock_irqsave)(&afe_priv->afe_ctrl_lock); adda_afe_on_ref_cnt--; if (adda_afe_on_ref_cnt == 0) @@ -96,8 +92,6 @@ int mt8365_dai_disable_adda_on(struct mtk_base_afe *afe) dev_warn(afe->dev, "Abnormal adda_on ref count. Force it to 0\n"); } - spin_unlock_irqrestore(&afe_priv->afe_ctrl_lock, flags); - return 0; }