ASoC: SOF: imx: imx-common: Use guard() for spinlock_irqsafe()

ujfalusi · bardliao · commit 627cbd4a25fe · 2025-11-10T11:42:24.000+08:00
Replace the manual spinlock_irqsafe 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/imx/imx-common.c b/sound/soc/sof/imx/imx-common.c
@@ -81,14 +81,10 @@ EXPORT_SYMBOL(imx8_dump);
 
 static void imx_handle_reply(struct imx_dsp_ipc *ipc)
 {
-	struct snd_sof_dev *sdev;
-	unsigned long flags;
-
-	sdev = imx_dsp_get_data(ipc);
+	struct snd_sof_dev *sdev = imx_dsp_get_data(ipc);
 
-	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 imx_handle_request(struct imx_dsp_ipc *ipc)

Original file line number	Diff line number	Diff line change
`@@ -81,14 +81,10 @@ EXPORT_SYMBOL(imx8_dump);`
`81`	`81`
`82`	`82`	`static void imx_handle_reply(struct imx_dsp_ipc *ipc)`
`83`	`83`	`{`
`84`		`- struct snd_sof_dev *sdev;`
`85`		`- unsigned long flags;`
`86`		`-`
`87`		`- sdev = imx_dsp_get_data(ipc);`
	`84`	`+ struct snd_sof_dev *sdev = imx_dsp_get_data(ipc);`
`88`	`85`
`89`		`- spin_lock_irqsave(&sdev->ipc_lock, flags);`
	`86`	`+ guard(spinlock_irqsave)(&sdev->ipc_lock);`
`90`	`87`	`snd_sof_ipc_process_reply(sdev, 0);`
`91`		`- spin_unlock_irqrestore(&sdev->ipc_lock, flags);`
`92`	`88`	`}`
`93`	`89`
`94`	`90`	`static void imx_handle_request(struct imx_dsp_ipc *ipc)`