Skip to contentSkip to conversation

ALSA: hda: Component should be unbound before deconstruction

PATCH Applied Simon Trimmer 2 participants 5 messages Jun 13, 2024 – Jun 14, 2024 Sound

lore
Share & tools
lore
#0 lore raw

cover ALSA: hda: Component should be unbound before deconstruction

Small chain of fixes to correct hda drivers using the hda component infrastructure so that they unregister their component before proceeding to deconstruct the driver.

These three patches been separated from the chain "[PATCH v2 0/7] ALSA:
hda: Improvements to hda_component"

Simon Trimmer (3):
ALSA: hda: cs35l56: Component should be unbound before deconstruction
ALSA: hda: cs35l41: Component should be unbound before deconstruction
ALSA: hda: tas2781: Component should be unbound before deconstruction

 sound/pci/hda/cs35l41_hda.c     | 4 ++--
 sound/pci/hda/cs35l56_hda.c     | 4 ++--
 sound/pci/hda/tas2781_hda_i2c.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
Signature · 1 line
2.34.1
#1 lore raw

PATCH 1/3 ALSA: hda: cs35l56: Component should be unbound before deconstruction

The interface associated with the hda_component should be deactivated before the driver is deconstructed during removal.

Fixes 73cfbfa9caea ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier")
---
 sound/pci/hda/cs35l56_hda.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/cs35l56_hda.c +2 -2
index 0923e2589f5f..e134ede6c5aa 100644
@@ -1077,12 +1077,12 @@ void cs35l56_hda_remove(struct device *dev)
 {
 	struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev);
 
+	component_del(cs35l56->base.dev, &cs35l56_hda_comp_ops);
+
 	pm_runtime_dont_use_autosuspend(cs35l56->base.dev);
 	pm_runtime_get_sync(cs35l56->base.dev);
 	pm_runtime_disable(cs35l56->base.dev);
 
-	component_del(cs35l56->base.dev, &cs35l56_hda_comp_ops);
-
 	cs_dsp_remove(&cs35l56->cs_dsp);
 
 	kfree(cs35l56->system_name);
Signature · 1 line
2.34.1
#2 lore raw

PATCH 2/3 ALSA: hda: cs35l41: Component should be unbound before deconstruction

In reply to Simon Trimmer

The interface associated with the hda_component should be deactivated before the driver is deconstructed during removal.

Fixes 7b2f3eb492da ("ALSA: hda: cs35l41: Add support for CS35L41 in HDA systems")
---
 sound/pci/hda/cs35l41_hda.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/cs35l41_hda.c +2 -2
index d54d4d60b03e..031703f010be 100644
@@ -2019,6 +2019,8 @@ void cs35l41_hda_remove(struct device *dev)
 {
 	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
 
+	component_del(cs35l41->dev, &cs35l41_hda_comp_ops);
+
 	pm_runtime_get_sync(cs35l41->dev);
 	pm_runtime_dont_use_autosuspend(cs35l41->dev);
 	pm_runtime_disable(cs35l41->dev);
@@ -2026,8 +2028,6 @@ void cs35l41_hda_remove(struct device *dev)
 	if (cs35l41->halo_initialized)
 		cs35l41_remove_dsp(cs35l41);
 
-	component_del(cs35l41->dev, &cs35l41_hda_comp_ops);
-
 	acpi_dev_put(cs35l41->dacpi);
 
 	pm_runtime_put_noidle(cs35l41->dev);
Signature · 1 line
2.34.1
#3 lore raw

PATCH 3/3 ALSA: hda: tas2781: Component should be unbound before deconstruction

In reply to Simon Trimmer

The interface associated with the hda_component should be deactivated before the driver is deconstructed during removal.

Fixes 4e7914eb1dae ("ALSA: hda/tas2781: remove sound controls in unbind")
---
 sound/pci/hda/tas2781_hda_i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/hda/tas2781_hda_i2c.c +2 -2
index 75f7674c66ee..fdee6592c502 100644
@@ -777,11 +777,11 @@ static void tas2781_hda_remove(struct device *dev)
 {
 	struct tas2781_hda *tas_hda = dev_get_drvdata(dev);
 
+	component_del(tas_hda->dev, &tas2781_hda_comp_ops);
+
 	pm_runtime_get_sync(tas_hda->dev);
 	pm_runtime_disable(tas_hda->dev);
 
-	component_del(tas_hda->dev, &tas2781_hda_comp_ops);
-
 	pm_runtime_put_noidle(tas_hda->dev);
 
 	tasdevice_remove(tas_hda->priv);
Signature · 1 line
2.34.1
Applied
#4 lore raw
In reply to Simon Trimmer
Quoted 5 lines · Simon Trimmer

Small chain of fixes to correct hda drivers using the hda component infrastructure so that they unregister their component before proceeding to deconstruct the driver.

Quoted 7 lines

These three patches been separated from the chain "[PATCH v2 0/7] ALSA:
hda: Improvements to hda_component"

Simon Trimmer (3):
ALSA: hda: cs35l56: Component should be unbound before deconstruction
ALSA: hda: cs35l41: Component should be unbound before deconstruction
ALSA: hda: tas2781: Component should be unbound before deconstruction

Applied to for-linus branch now.

thanks,

Takashi