[PATCH] ALSA: hda: cs35l56: Remove redundant call to hda_cs_dsp_control_remove()

Richard Fitzgerald posted 1 patch 1 year, 5 months ago
sound/pci/hda/cs35l56_hda.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] ALSA: hda: cs35l56: Remove redundant call to hda_cs_dsp_control_remove()
Posted by Richard Fitzgerald 1 year, 5 months ago
The driver doesn't create any ALSA controls for firmware controls, so it
shouldn't be calling hda_cs_dsp_control_remove().

commit 34e1b1bb7324 ("ALSA: hda: cs35l56: Stop creating ALSA controls for
firmware coefficients") removed the call to hda_cs_dsp_add_controls() but
didn't remove the call for destroying those controls.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Fixes: 34e1b1bb7324 ("ALSA: hda: cs35l56: Stop creating ALSA controls for firmware coefficients")
---
 sound/pci/hda/cs35l56_hda.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c
index 31cc92bac89a..a9dfd62637cf 100644
--- a/sound/pci/hda/cs35l56_hda.c
+++ b/sound/pci/hda/cs35l56_hda.c
@@ -413,7 +413,7 @@ static void cs35l56_hda_remove_controls(struct cs35l56_hda *cs35l56)
 }
 
 static const struct cs_dsp_client_ops cs35l56_hda_client_ops = {
-	.control_remove = hda_cs_dsp_control_remove,
+	/* cs_dsp requires the client to provide this even if it is empty */
 };
 
 static int cs35l56_hda_request_firmware_file(struct cs35l56_hda *cs35l56,
-- 
2.39.2
Re: [PATCH] ALSA: hda: cs35l56: Remove redundant call to hda_cs_dsp_control_remove()
Posted by Takashi Iwai 1 year, 5 months ago
On Tue, 13 Aug 2024 13:07:50 +0200,
Richard Fitzgerald wrote:
> 
> The driver doesn't create any ALSA controls for firmware controls, so it
> shouldn't be calling hda_cs_dsp_control_remove().
> 
> commit 34e1b1bb7324 ("ALSA: hda: cs35l56: Stop creating ALSA controls for
> firmware coefficients") removed the call to hda_cs_dsp_add_controls() but
> didn't remove the call for destroying those controls.
> 
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
> Fixes: 34e1b1bb7324 ("ALSA: hda: cs35l56: Stop creating ALSA controls for firmware coefficients")

Applied now.

I suppose you'll submit the fix for cs35l41, too?


thanks,

Takashi