Skip to contentSkip to conversation

ASoC: Call snd_soc_unregister_dais instead of snd_soc_unregister_dai in sh4_soc_dai_remove

PATCH Applied Axel Lin 3 participants 3 messages Nov 25, 2010

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: Call snd_soc_unregister_dais instead of snd_soc_unregister_dai in sh4_soc_dai_remove

We call snd_soc_register_dais() in sh4_soc_dai_probe(), thus we should call snd_soc_unregister_dais() in sh4_soc_dai_remove().

Otherwise, we got "too many arguments to function 'snd_soc_unregister_dai'" error message.

---
 sound/soc/sh/ssi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/sh/ssi.c +1 -1
index 40bbdf1..05192d9 100644
@@ -387,7 +387,7 @@ static int __devinit sh4_soc_dai_probe(struct platform_device *pdev)
 
 static int __devexit sh4_soc_dai_remove(struct platform_device *pdev)
 {
-	snd_soc_unregister_dai(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+	snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
 	return 0;
 }
 
Signature · 1 line
1.7.2
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Axel Lin

We call snd_soc_register_dais() in sh4_soc_dai_probe(), thus we should call snd_soc_unregister_dais() in sh4_soc_dai_remove().

Otherwise, we got "too many arguments to function 'snd_soc_unregister_dai'" error message.

---
 sound/soc/sh/ssi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/sh/ssi.c +0 -0
index 40bbdf1..05192d9 100644

sound/soc/sh/ssi.c static int __devinit sh4_soc_dai_probe(struct platform_device *pdev) · line 393

Quoted 8 lines
sound/soc/sh/ssi.c +1 -1
@@ -387,7 +387,7 @@ static int __devinit sh4_soc_dai_probe(struct platform_device *pdev)
 
 static int __devexit sh4_soc_dai_remove(struct platform_device *pdev)
 {
-	snd_soc_unregister_dai(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
+	snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai));
 	return 0;
 }
 
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
Applied
#2 lore raw
In reply to Axel Lin
Quoted 2 lines · Axel Lin

We call snd_soc_register_dais() in sh4_soc_dai_probe(), thus we should call snd_soc_unregister_dais() in sh4_soc_dai_remove().

Applied, thanks.