Delete the 'removing' flag and don't kick init_completion to make a
quick cancel of dsp_work(). Just let it timeout on the wait for the
completion.
Simplify the code to standard cancelling or flushing of the work.
This avoids introducing corner cases from a layer of custom signalling.
It also avoids potential race conditions when system-suspend handling
is added.
Unless the hardware is broken, the dsp_work() will already have started
and passed the completion before the driver would want to cancel it.
Signed-off-by: Richard Fitzgerald <[email protected]>
---
sound/soc/codecs/cs35l56.c | 8 +-------
sound/soc/codecs/cs35l56.h | 1 -
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/sound/soc/codecs/cs35l56.c b/sound/soc/codecs/cs35l56.c
index d97b465f0d3c..675aad8e909f 100644
--- a/sound/soc/codecs/cs35l56.c
+++ b/sound/soc/codecs/cs35l56.c
@@ -867,7 +867,7 @@ static void cs35l56_dsp_work(struct work_struct *work)
goto complete;
}
- if (!cs35l56->init_done || cs35l56->removing)
+ if (!cs35l56->init_done)
goto complete;
cs35l56->dsp.part = devm_kasprintf(cs35l56->dev, GFP_KERNEL, "cs35l56%s-%02x",
@@ -917,9 +917,6 @@ static void cs35l56_dsp_work(struct work_struct *work)
goto err;
}
- if (cs35l56->removing)
- goto err;
-
mutex_lock(&cs35l56->irq_lock);
init_completion(&cs35l56->init_completion);
@@ -967,7 +964,6 @@ static int cs35l56_component_probe(struct snd_soc_component *component)
BUILD_BUG_ON(ARRAY_SIZE(cs35l56_tx_input_texts) != ARRAY_SIZE(cs35l56_tx_input_values));
- cs35l56->removing = false;
cs35l56->component = component;
wm_adsp2_component_probe(&cs35l56->dsp, component);
@@ -984,8 +980,6 @@ static void cs35l56_component_remove(struct snd_soc_component *component)
{
struct cs35l56_private *cs35l56 = snd_soc_component_get_drvdata(component);
- cs35l56->removing = true;
- complete(&cs35l56->init_completion);
cancel_work_sync(&cs35l56->dsp_work);
}
diff --git a/sound/soc/codecs/cs35l56.h b/sound/soc/codecs/cs35l56.h
index efc4b99180f9..dc91cd7d877f 100644
--- a/sound/soc/codecs/cs35l56.h
+++ b/sound/soc/codecs/cs35l56.h
@@ -49,7 +49,6 @@ struct cs35l56_private {
bool soft_resetting;
bool init_done;
bool sdw_attached;
- bool removing;
bool fw_patched;
bool can_hibernate;
struct completion init_completion;
--
2.30.2