Skip to contentSkip to conversation

ASoC: cs35l56: Fixes for driver cleanup

PATCH In review Richard Fitzgerald 2 participants 4 messages May 5 – May 6

Subsystems (3)
lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

v2 cover ASoC: cs35l56: Fixes for driver cleanup

Two patches to fix cleanup during driver remove() and the error path of probe().

The main purpose is to fix cleanup of the workqueue.

Richard Fitzgerald (2):
ASoC: cs35l56: Don't use devres to unregister component
ASoC: cs35l56: Destroy workqueue in probe error path

 sound/soc/codecs/cs35l56.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
Signature · 1 line
2.47.3
author maintainer
#1 lore raw

PATCH v2 1/2 ASoC: cs35l56: Don't use devres to unregister component

Manually call snd_soc_unregister_component() from cs35l56_remove() instead of using devres cleanup. This ensures that the component is destroyed before cs35l56_remove() starts cleanup of anything the component code could be using.

Devres cleanup happens after the driver remove() callback, so if snd_soc_register_component() is used, it will not be destroyed until after cs35l56_remove() has returned. But there is some cleanup that must be done in cs35l56_remove(), or wrapped in a custom devres cleanup handler to ensure correct ordering. The simplest option is to call snd_soc_unregister_component() at the start of cs35l56_remove().

Fixes e49611252900 ("ASoC: cs35l56: Add driver for Cirrus Logic CS35L56")

---
New in V2 series.

 sound/soc/codecs/cs35l56.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
sound/soc/codecs/cs35l56.c +5 -3
index 378017fcea10..e847bb32af2e 100644
@@ -1956,9 +1956,9 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
 		goto err;
 	}
 
-	ret = devm_snd_soc_register_component(cs35l56->base.dev,
-					      &soc_component_dev_cs35l56,
-					      cs35l56_dai, ARRAY_SIZE(cs35l56_dai));
+	ret = snd_soc_register_component(cs35l56->base.dev,
+					 &soc_component_dev_cs35l56,
+					 cs35l56_dai, ARRAY_SIZE(cs35l56_dai));
 	if (ret < 0) {
 		dev_err_probe(cs35l56->base.dev, ret, "Register codec failed\n");
 		goto err;
@@ -2057,6 +2057,8 @@ EXPORT_SYMBOL_NS_GPL(cs35l56_init, "SND_SOC_CS35L56_CORE");
 
 void cs35l56_remove(struct cs35l56_private *cs35l56)
 {
+	snd_soc_unregister_component(cs35l56->base.dev);
+
 	cs35l56->base.init_done = false;
 
 	/*
Signature · 1 line
2.47.3
author maintainer
#2 lore raw

PATCH v2 2/2 ASoC: cs35l56: Destroy workqueue in probe error path

In reply to Richard Fitzgerald

The error path in cs35l56_common_probe() should call destroy_workqueue() on the workqueue that was created by cs35l56_dsp_init().

Fixes e49611252900 ("ASoC: cs35l56: Add driver for Cirrus Logic CS35L56")

---
No changes from V1

 sound/soc/codecs/cs35l56.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/codecs/cs35l56.c +3 -0
index e847bb32af2e..849d70ca23d6 100644
@@ -1970,6 +1970,9 @@ int cs35l56_common_probe(struct cs35l56_private *cs35l56)
 	gpiod_set_value_cansleep(cs35l56->base.reset_gpio, 0);
 	regulator_bulk_disable(ARRAY_SIZE(cs35l56->supplies), cs35l56->supplies);
 
+	if (cs35l56->dsp_wq)
+		destroy_workqueue(cs35l56->dsp_wq);
+
 	return ret;
 }
 EXPORT_SYMBOL_NS_GPL(cs35l56_common_probe, "SND_SOC_CS35L56_CORE");
Signature · 1 line
2.47.3
maintainer
#3 lore raw
In reply to Richard Fitzgerald
Quoted 8 lines · Richard Fitzgerald

ASoC: cs35l56: Fixes for driver cleanup

Two patches to fix cleanup during driver remove() and the error path of probe().

The main purpose is to fix cleanup of the workqueue.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.1

Thanks!

[1/2] ASoC: cs35l56: Don't use devres to unregister component

      https://git.kernel.org/broonie/sound/c/bee87cf0f124
[2/2] ASoC: cs35l56: Destroy workqueue in probe error path
      https://git.kernel.org/broonie/sound/c/fd4d83e1437d

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark