From: Richard Fitzgerald <rf@opensource.cirrus.com>
To: broonie@kernel.org
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com
Subject: [PATCH] ASoC: cs35l56: Use devres to destroy workqueue
Date: Mon, 4 May 2026 12:07:43 +0100 [thread overview]
Message-ID: <20260504110743.3341869-1-rf@opensource.cirrus.com> (raw)
In cs35l56_dsp_init() use devm_add_action_or_reset() to add a devres
cleanup function that flushes and destroys the workqueue. This replaces
manually calling destroy_workqueue().
The error path in cs35l56_common_probe() did not call destroy_workqueue().
Using devres keeps the destroy_workqueue() automatically ordered relative
to all the other devres-managed cleanup.
The call to destroy_workqueue() in cs35l56_remove() has been deleted.
The use of devres cleanup was suggested by https://sashiko.dev to avoid a
small cleanup inversion window if destroy_workqueue() is called in the
error path of cs35l56_common_probe().
Fixes: e49611252900 ("ASoC: cs35l56: Add driver for Cirrus Logic CS35L56")
Closes: https://sashiko.dev/#/patchset/20260501103002.2843735-1-rf%40opensource.cirrus.com
Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
---
sound/soc/codecs/cs35l56.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index 378017fcea10..030051292534 100644
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -1627,6 +1627,14 @@ static int cs35l56_control_add_nop(struct wm_adsp *dsp, struct cs_dsp_coeff_ctl
return 0;
}
+static void cs35l56_dsp_workqueue_destroy(void *data)
+{
+ struct workqueue_struct *wq = data;
+
+ flush_workqueue(wq);
+ destroy_workqueue(wq);
+}
+
static int cs35l56_dsp_init(struct cs35l56_private *cs35l56)
{
struct wm_adsp *dsp;
@@ -1636,6 +1644,12 @@ static int cs35l56_dsp_init(struct cs35l56_private *cs35l56)
if (!cs35l56->dsp_wq)
return -ENOMEM;
+ ret = devm_add_action_or_reset(cs35l56->base.dev,
+ cs35l56_dsp_workqueue_destroy,
+ cs35l56->dsp_wq);
+ if (ret)
+ return ret;
+
INIT_WORK(&cs35l56->dsp_work, cs35l56_dsp_work);
dsp = &cs35l56->dsp;
@@ -2066,8 +2080,6 @@ void cs35l56_remove(struct cs35l56_private *cs35l56)
if (cs35l56->base.irq)
devm_free_irq(cs35l56->base.dev, cs35l56->base.irq, &cs35l56->base);
- destroy_workqueue(cs35l56->dsp_wq);
-
pm_runtime_dont_use_autosuspend(cs35l56->base.dev);
pm_runtime_suspend(cs35l56->base.dev);
pm_runtime_disable(cs35l56->base.dev);
--
2.47.3
next reply other threads:[~2026-05-04 11:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 11:07 Richard Fitzgerald [this message]
2026-05-04 12:01 ` [PATCH] ASoC: cs35l56: Use devres to destroy workqueue Richard Fitzgerald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260504110743.3341869-1-rf@opensource.cirrus.com \
--to=rf@opensource.cirrus.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox