ASoC: SOF: mediatek: Use guard() for spinlock_irqsave

ujfalusi · bardliao · commit c2252fd7b532 · 2025-11-10T11:42:24.000+08:00
Replace the manual spinlock_irqsave lock/unlock pairs with guard().

Only code refactoring, and no behavior change.

Signed-off-by: Peter Ujfalusi &lt;peter.ujfalusi@linux.intel.com&gt;
diff --git a/sound/soc/sof/mediatek/mt8365/mt8365.c b/sound/soc/sof/mediatek/mt8365/mt8365.c
@@ -109,11 +109,8 @@ static int mt8365_send_msg(struct snd_sof_dev *sdev,
 
 static void mt8365_dsp_handle_reply(struct snd_sof_dev *sdev)
 {
-	unsigned long flags;
-
-	spin_lock_irqsave(&sdev->ipc_lock, flags);
+	guard(spinlock_irqsave)(&sdev->ipc_lock);
 	snd_sof_ipc_process_reply(sdev, 0);
-	spin_unlock_irqrestore(&sdev->ipc_lock, flags);
 }
 
 static void mt8365_dsp_handle_request(struct snd_sof_dev *sdev)
diff --git a/sound/soc/sof/mediatek/mtk-adsp-common.c b/sound/soc/sof/mediatek/mtk-adsp-common.c
@@ -107,11 +107,9 @@ EXPORT_SYMBOL(mtk_adsp_send_msg);
 void mtk_adsp_handle_reply(struct mtk_adsp_ipc *ipc)
 {
 	struct adsp_priv *priv = mtk_adsp_ipc_get_data(ipc);
-	unsigned long flags;
 
-	spin_lock_irqsave(&priv->sdev->ipc_lock, flags);
+	guard(spinlock_irqsave)(&priv->sdev->ipc_lock);
 	snd_sof_ipc_process_reply(priv->sdev, 0);
-	spin_unlock_irqrestore(&priv->sdev->ipc_lock, flags);
 }
 EXPORT_SYMBOL(mtk_adsp_handle_reply);
 

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,8 @@ static int mt8365_send_msg(struct snd_sof_dev *sdev,`
`109`	`109`
`110`	`110`	`static void mt8365_dsp_handle_reply(struct snd_sof_dev *sdev)`
`111`	`111`	`{`
`112`		`- unsigned long flags;`
`113`		`-`
`114`		`- spin_lock_irqsave(&sdev->ipc_lock, flags);`
	`112`	`+ guard(spinlock_irqsave)(&sdev->ipc_lock);`
`115`	`113`	`snd_sof_ipc_process_reply(sdev, 0);`
`116`		`- spin_unlock_irqrestore(&sdev->ipc_lock, flags);`
`117`	`114`	`}`
`118`	`115`
`119`	`116`	`static void mt8365_dsp_handle_request(struct snd_sof_dev *sdev)`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,9 @@ EXPORT_SYMBOL(mtk_adsp_send_msg);`
`107`	`107`	`void mtk_adsp_handle_reply(struct mtk_adsp_ipc *ipc)`
`108`	`108`	`{`
`109`	`109`	`struct adsp_priv *priv = mtk_adsp_ipc_get_data(ipc);`
`110`		`- unsigned long flags;`
`111`	`110`
`112`		`- spin_lock_irqsave(&priv->sdev->ipc_lock, flags);`
	`111`	`+ guard(spinlock_irqsave)(&priv->sdev->ipc_lock);`
`113`	`112`	`snd_sof_ipc_process_reply(priv->sdev, 0);`
`114`		`- spin_unlock_irqrestore(&priv->sdev->ipc_lock, flags);`
`115`	`113`	`}`
`116`	`114`	`EXPORT_SYMBOL(mtk_adsp_handle_reply);`
`117`	`115`