ASoC: SOF: Use guard()/scoped_guard() for mutex locks where it makes sense

ujfalusi · broonie · commit 5c19da34df02 · 2026-01-12T11:21:24.000Z
Replace the manual mutex lock/unlock pairs with guard()/scoped_guard(). Only code refactoring, and no behavior change. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Link: https://patch.msgid.link/20260112101004.7648-2-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
@@ -225,9 +225,8 @@ void snd_sof_ipc_free(struct snd_sof_dev *sdev)
 		return;
 
 	/* disable sending of ipc's */
-	mutex_lock(&ipc->tx_mutex);
-	ipc->disable_ipc_tx = true;
-	mutex_unlock(&ipc->tx_mutex);
+	scoped_guard(mutex, &ipc->tx_mutex)
+		ipc->disable_ipc_tx = true;
 
 	if (ipc->ops->exit)
 		ipc->ops->exit(sdev);
diff --git a/sound/soc/sof/ipc3-topology.c b/sound/soc/sof/ipc3-topology.c
@@ -2427,9 +2427,9 @@ static int sof_ipc3_free_widgets_in_list(struct snd_sof_dev *sdev, bool include_
 		/* Do not free widgets for static pipelines with FW older than SOF2.2 */
 		if (!verify && !swidget->dynamic_pipeline_widget &&
 		    SOF_FW_VER(v->major, v->minor, v->micro) < SOF_FW_VER(2, 2, 0)) {
-			mutex_lock(&swidget->setup_mutex);
-			swidget->use_count = 0;
-			mutex_unlock(&swidget->setup_mutex);
+			scoped_guard(mutex, &swidget->setup_mutex)
+				swidget->use_count = 0;
+
 			if (swidget->spipe)
 				swidget->spipe->complete = 0;
 			continue;
diff --git a/sound/soc/sof/ipc3.c b/sound/soc/sof/ipc3.c
@@ -378,7 +378,7 @@ static int sof_ipc3_tx_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_
 	}
 
 	/* Serialise IPC TX */
-	mutex_lock(&ipc->tx_mutex);
+	guard(mutex)(&ipc->tx_mutex);
 
 	ret = ipc3_tx_msg_unlocked(ipc, msg_data, msg_bytes, reply_data, reply_bytes);
 
@@ -405,8 +405,6 @@ static int sof_ipc3_tx_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_
 		}
 	}
 
-	mutex_unlock(&ipc->tx_mutex);
-
 	return ret;
 }
 
@@ -477,7 +475,7 @@ static int sof_ipc3_set_get_data(struct snd_sof_dev *sdev, void *data, size_t da
 	memcpy(cdata_chunk, cdata, hdr_bytes);
 
 	/* Serialise IPC TX */
-	mutex_lock(&sdev->ipc->tx_mutex);
+	guard(mutex)(&ipc->tx_mutex);
 
 	/* copy the payload data in a loop */
 	for (i = 0; i < num_msg; i++) {
@@ -511,8 +509,6 @@ static int sof_ipc3_set_get_data(struct snd_sof_dev *sdev, void *data, size_t da
 		sof_ipc3_dump_payload(sdev, payload, data_bytes - header_bytes);
 	}
 
-	mutex_unlock(&sdev->ipc->tx_mutex);
-
 	kfree(cdata_chunk);
 
 	return ret;
diff --git a/sound/soc/sof/ipc4-mtrace.c b/sound/soc/sof/ipc4-mtrace.c
@@ -118,22 +118,19 @@ static int sof_ipc4_mtrace_dfs_open(struct inode *inode, struct file *file)
 	struct sof_mtrace_core_data *core_data = inode->i_private;
 	int ret;
 
-	mutex_lock(&core_data->buffer_lock);
+	guard(mutex)(&core_data->buffer_lock);
 
-	if (core_data->log_buffer) {
-		ret = -EBUSY;
-		goto out;
-	}
+	if (core_data->log_buffer)
+		return -EBUSY;
 
 	ret = debugfs_file_get(file->f_path.dentry);
 	if (unlikely(ret))
-		goto out;
+		return ret;
 
 	core_data->log_buffer = kmalloc(SOF_IPC4_DEBUG_SLOT_SIZE, GFP_KERNEL);
 	if (!core_data->log_buffer) {
 		debugfs_file_put(file->f_path.dentry);
-		ret = -ENOMEM;
-		goto out;
+		return -ENOMEM;
 	}
 
 	ret = simple_open(inode, file);
@@ -142,9 +139,6 @@ static int sof_ipc4_mtrace_dfs_open(struct inode *inode, struct file *file)
 		debugfs_file_put(file->f_path.dentry);
 	}
 
-out:
-	mutex_unlock(&core_data->buffer_lock);
-
 	return ret;
 }
 
@@ -281,10 +275,10 @@ static int sof_ipc4_mtrace_dfs_release(struct inode *inode, struct file *file)
 
 	debugfs_file_put(file->f_path.dentry);
 
-	mutex_lock(&core_data->buffer_lock);
-	kfree(core_data->log_buffer);
-	core_data->log_buffer = NULL;
-	mutex_unlock(&core_data->buffer_lock);
+	scoped_guard(mutex, &core_data->buffer_lock) {
+		kfree(core_data->log_buffer);
+		core_data->log_buffer = NULL;
+	}
 
 	return 0;
 }
diff --git a/sound/soc/sof/ipc4-pcm.c b/sound/soc/sof/ipc4-pcm.c
@@ -487,7 +487,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component,
 		return -ENOMEM;
 	}
 
-	mutex_lock(&ipc4_data->pipeline_state_mutex);
+	guard(mutex)(&ipc4_data->pipeline_state_mutex);
 
 	/*
 	 * IPC4 requires pipelines to be triggered in order starting at the sink and
@@ -580,7 +580,6 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component,
 	}
 
 free:
-	mutex_unlock(&ipc4_data->pipeline_state_mutex);
 	kfree(trigger_list);
 	kfree(pipe_priority);
 	return ret;
diff --git a/sound/soc/sof/ipc4-topology.c b/sound/soc/sof/ipc4-topology.c
@@ -3150,7 +3150,7 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget
 	struct sof_ipc4_fw_data *ipc4_data = sdev->private;
 	int ret = 0;
 
-	mutex_lock(&ipc4_data->pipeline_state_mutex);
+	guard(mutex)(&ipc4_data->pipeline_state_mutex);
 
 	/* freeing a pipeline frees all the widgets associated with it */
 	if (swidget->id == snd_soc_dapm_scheduler) {
@@ -3161,7 +3161,6 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget
 		if (pipeline->use_chain_dma) {
 			dev_warn(sdev->dev, "use_chain_dma set for scheduler %s",
 				 swidget->widget->name);
-			mutex_unlock(&ipc4_data->pipeline_state_mutex);
 			return 0;
 		}
 
@@ -3189,8 +3188,6 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget
 			ida_free(&fw_module->m_ida, swidget->instance_id);
 	}
 
-	mutex_unlock(&ipc4_data->pipeline_state_mutex);
-
 	return ret;
 }
 
diff --git a/sound/soc/sof/ipc4.c b/sound/soc/sof/ipc4.c
@@ -412,7 +412,7 @@ static int sof_ipc4_tx_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_
 	}
 
 	/* Serialise IPC TX */
-	mutex_lock(&ipc->tx_mutex);
+	guard(mutex)(&ipc->tx_mutex);
 
 	ret = ipc4_tx_msg_unlocked(ipc, msg_data, msg_bytes, reply_data, reply_bytes);
 
@@ -429,8 +429,6 @@ static int sof_ipc4_tx_msg(struct snd_sof_dev *sdev, void *msg_data, size_t msg_
 			sof_ipc4_dump_payload(sdev, msg->data_ptr, msg->data_size);
 	}
 
-	mutex_unlock(&ipc->tx_mutex);
-
 	return ret;
 }
 
@@ -506,7 +504,7 @@ static int sof_ipc4_set_get_data(struct snd_sof_dev *sdev, void *data,
 	}
 
 	/* Serialise IPC TX */
-	mutex_lock(&sdev->ipc->tx_mutex);
+	guard(mutex)(&sdev->ipc->tx_mutex);
 
 	do {
 		size_t tx_size, rx_size;
@@ -590,8 +588,6 @@ static int sof_ipc4_set_get_data(struct snd_sof_dev *sdev, void *data,
 	if (sof_debug_check_flag(SOF_DBG_DUMP_IPC_MESSAGE_PAYLOAD))
 		sof_ipc4_dump_payload(sdev, ipc4_msg->data_ptr, ipc4_msg->data_size);
 
-	mutex_unlock(&sdev->ipc->tx_mutex);
-
 	kfree(tx_payload_for_get);
 
 	return ret;
diff --git a/sound/soc/sof/ops.h b/sound/soc/sof/ops.h
@@ -287,16 +287,12 @@ static inline int
 snd_sof_dsp_set_power_state(struct snd_sof_dev *sdev,
 			    const struct sof_dsp_power_state *target_state)
 {
-	int ret = 0;
-
-	mutex_lock(&sdev->power_state_access);
+	guard(mutex)(&sdev->power_state_access);
 
 	if (sof_ops(sdev)->set_power_state)
-		ret = sof_ops(sdev)->set_power_state(sdev, target_state);
-
-	mutex_unlock(&sdev->power_state_access);
+		return sof_ops(sdev)->set_power_state(sdev, target_state);
 
-	return ret;
+	return 0;
 }
 
 /* debug */
diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
@@ -121,13 +121,8 @@ static int sof_widget_free_unlocked(struct snd_sof_dev *sdev,
 
 int sof_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
 {
-	int ret;
-
-	mutex_lock(&swidget->setup_mutex);
-	ret = sof_widget_free_unlocked(sdev, swidget);
-	mutex_unlock(&swidget->setup_mutex);
-
-	return ret;
+	guard(mutex)(&swidget->setup_mutex);
+	return sof_widget_free_unlocked(sdev, swidget);
 }
 EXPORT_SYMBOL(sof_widget_free);
 
@@ -240,13 +235,8 @@ static int sof_widget_setup_unlocked(struct snd_sof_dev *sdev,
 
 int sof_widget_setup(struct snd_sof_dev *sdev, struct snd_sof_widget *swidget)
 {
-	int ret;
-
-	mutex_lock(&swidget->setup_mutex);
-	ret = sof_widget_setup_unlocked(sdev, swidget);
-	mutex_unlock(&swidget->setup_mutex);
-
-	return ret;
+	guard(mutex)(&swidget->setup_mutex);
+	return sof_widget_setup_unlocked(sdev, swidget);
 }
 EXPORT_SYMBOL(sof_widget_setup);
 
@@ -377,24 +367,22 @@ static int sof_setup_pipeline_connections(struct snd_sof_dev *sdev,
 		else
 			swidget = sroute->src_widget;
 
-		mutex_lock(&swidget->setup_mutex);
-		if (!swidget->use_count) {
-			mutex_unlock(&swidget->setup_mutex);
-			continue;
-		}
+		scoped_guard(mutex, &swidget->setup_mutex) {
+			if (!swidget->use_count)
+				continue;
 
-		if (tplg_ops && tplg_ops->route_setup) {
-			/*
-			 * this route will get freed when either the source widget or the sink
-			 * widget is freed during hw_free
-			 */
-			ret = tplg_ops->route_setup(sdev, sroute);
-			if (!ret)
-				sroute->setup = true;
+			if (tplg_ops && tplg_ops->route_setup) {
+				/*
+				 * this route will get freed when either the
+				 * source widget or the sink widget is freed
+				 * during hw_free
+				 */
+				ret = tplg_ops->route_setup(sdev, sroute);
+				if (!ret)
+					sroute->setup = true;
+			}
 		}
 
-		mutex_unlock(&swidget->setup_mutex);
-
 		if (ret < 0)
 			return ret;
 	}
diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ static int sof_ipc3_tx_msg(struct snd_sof_dev sdev, void msg_data, size_t msg_`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`/* Serialise IPC TX */`
`381`		`- mutex_lock(&ipc->tx_mutex);`
	`381`	`+ guard(mutex)(&ipc->tx_mutex);`
`382`	`382`
`383`	`383`	`ret = ipc3_tx_msg_unlocked(ipc, msg_data, msg_bytes, reply_data, reply_bytes);`
`384`	`384`
`@@ -405,8 +405,6 @@ static int sof_ipc3_tx_msg(struct snd_sof_dev sdev, void msg_data, size_t msg_`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`
`408`		`- mutex_unlock(&ipc->tx_mutex);`
`409`		`-`
`410`	`408`	`return ret;`
`411`	`409`	`}`
`412`	`410`
`@@ -477,7 +475,7 @@ static int sof_ipc3_set_get_data(struct snd_sof_dev sdev, void data, size_t da`
`477`	`475`	`memcpy(cdata_chunk, cdata, hdr_bytes);`
`478`	`476`
`479`	`477`	`/* Serialise IPC TX */`
`480`		`- mutex_lock(&sdev->ipc->tx_mutex);`
	`478`	`+ guard(mutex)(&ipc->tx_mutex);`
`481`	`479`
`482`	`480`	`/* copy the payload data in a loop */`
`483`	`481`	`for (i = 0; i < num_msg; i++) {`
`@@ -511,8 +509,6 @@ static int sof_ipc3_set_get_data(struct snd_sof_dev sdev, void data, size_t da`
`511`	`509`	`sof_ipc3_dump_payload(sdev, payload, data_bytes - header_bytes);`
`512`	`510`	`}`
`513`	`511`
`514`		`- mutex_unlock(&sdev->ipc->tx_mutex);`
`515`		`-`
`516`	`512`	`kfree(cdata_chunk);`
`517`	`513`
`518`	`514`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component,`
`487`	`487`	`return -ENOMEM;`
`488`	`488`	`}`
`489`	`489`
`490`		`- mutex_lock(&ipc4_data->pipeline_state_mutex);`
	`490`	`+ guard(mutex)(&ipc4_data->pipeline_state_mutex);`
`491`	`491`
`492`	`492`	`/*`
`493`	`493`	`* IPC4 requires pipelines to be triggered in order starting at the sink and`
`@@ -580,7 +580,6 @@ static int sof_ipc4_trigger_pipelines(struct snd_soc_component *component,`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`free:`
`583`		`- mutex_unlock(&ipc4_data->pipeline_state_mutex);`
`584`	`583`	`kfree(trigger_list);`
`585`	`584`	`kfree(pipe_priority);`
`586`	`585`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -3150,7 +3150,7 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget`
`3150`	`3150`	`struct sof_ipc4_fw_data *ipc4_data = sdev->private;`
`3151`	`3151`	`int ret = 0;`
`3152`	`3152`
`3153`		`- mutex_lock(&ipc4_data->pipeline_state_mutex);`
	`3153`	`+ guard(mutex)(&ipc4_data->pipeline_state_mutex);`
`3154`	`3154`
`3155`	`3155`	`/* freeing a pipeline frees all the widgets associated with it */`
`3156`	`3156`	`if (swidget->id == snd_soc_dapm_scheduler) {`
`@@ -3161,7 +3161,6 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget`
`3161`	`3161`	`if (pipeline->use_chain_dma) {`
`3162`	`3162`	`dev_warn(sdev->dev, "use_chain_dma set for scheduler %s",`
`3163`	`3163`	`swidget->widget->name);`
`3164`		`- mutex_unlock(&ipc4_data->pipeline_state_mutex);`
`3165`	`3164`	`return 0;`
`3166`	`3165`	`}`
`3167`	`3166`
`@@ -3189,8 +3188,6 @@ static int sof_ipc4_widget_free(struct snd_sof_dev *sdev, struct snd_sof_widget`
`3189`	`3188`	`ida_free(&fw_module->m_ida, swidget->instance_id);`
`3190`	`3189`	`}`
`3191`	`3190`
`3192`		`- mutex_unlock(&ipc4_data->pipeline_state_mutex);`
`3193`		`-`
`3194`	`3191`	`return ret;`
`3195`	`3192`	`}`
`3196`	`3193`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ static int sof_ipc4_tx_msg(struct snd_sof_dev sdev, void msg_data, size_t msg_`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`/* Serialise IPC TX */`
`415`		`- mutex_lock(&ipc->tx_mutex);`
	`415`	`+ guard(mutex)(&ipc->tx_mutex);`
`416`	`416`
`417`	`417`	`ret = ipc4_tx_msg_unlocked(ipc, msg_data, msg_bytes, reply_data, reply_bytes);`
`418`	`418`
`@@ -429,8 +429,6 @@ static int sof_ipc4_tx_msg(struct snd_sof_dev sdev, void msg_data, size_t msg_`
`429`	`429`	`sof_ipc4_dump_payload(sdev, msg->data_ptr, msg->data_size);`
`430`	`430`	`}`
`431`	`431`
`432`		`- mutex_unlock(&ipc->tx_mutex);`
`433`		`-`
`434`	`432`	`return ret;`
`435`	`433`	`}`
`436`	`434`
`@@ -506,7 +504,7 @@ static int sof_ipc4_set_get_data(struct snd_sof_dev sdev, void data,`
`506`	`504`	`}`
`507`	`505`
`508`	`506`	`/* Serialise IPC TX */`
`509`		`- mutex_lock(&sdev->ipc->tx_mutex);`
	`507`	`+ guard(mutex)(&sdev->ipc->tx_mutex);`
`510`	`508`
`511`	`509`	`do {`
`512`	`510`	`size_t tx_size, rx_size;`
`@@ -590,8 +588,6 @@ static int sof_ipc4_set_get_data(struct snd_sof_dev sdev, void data,`
`590`	`588`	`if (sof_debug_check_flag(SOF_DBG_DUMP_IPC_MESSAGE_PAYLOAD))`
`591`	`589`	`sof_ipc4_dump_payload(sdev, ipc4_msg->data_ptr, ipc4_msg->data_size);`
`592`	`590`
`593`		`- mutex_unlock(&sdev->ipc->tx_mutex);`
`594`		`-`
`595`	`591`	`kfree(tx_payload_for_get);`
`596`	`592`
`597`	`593`	`return ret;`