openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: bcm: use devm_snd_soc_register_component() 

Now we have devm_snd_soc_register_component().
Let's use it instead of snd_soc_register_component().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-09-07 01:00:49 +00:00 committed by Mark Brown
parent e14614dc51
commit 570f75b935
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/bcm/cygnus-ssp.c
View File

@ -1334,7 +1334,7 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
cygaud->active_ports = 0; cygaud->active_ports = 0;
dev_dbg(dev, "Registering %d DAIs\n", active_port_count); dev_dbg(dev, "Registering %d DAIs\n", active_port_count);
err = snd_soc_register_component(dev, &cygnus_ssp_component, err = devm_snd_soc_register_component(dev, &cygnus_ssp_component,
cygnus_ssp_dai, active_port_count); cygnus_ssp_dai, active_port_count);
if (err) { if (err) {
dev_err(dev, "snd_soc_register_dai failed\n"); dev_err(dev, "snd_soc_register_dai failed\n");
@ -1345,32 +1345,27 @@ static int cygnus_ssp_probe(struct platform_device *pdev)
if (cygaud->irq_num <= 0) { if (cygaud->irq_num <= 0) {
dev_err(dev, "platform_get_irq failed\n"); dev_err(dev, "platform_get_irq failed\n");
err = cygaud->irq_num; err = cygaud->irq_num;
goto err_irq; return err;
} }
err = audio_clk_init(pdev, cygaud); err = audio_clk_init(pdev, cygaud);
if (err) { if (err) {
dev_err(dev, "audio clock initialization failed\n"); dev_err(dev, "audio clock initialization failed\n");
goto err_irq; return err;
} }
err = cygnus_soc_platform_register(dev, cygaud); err = cygnus_soc_platform_register(dev, cygaud);
if (err) { if (err) {
dev_err(dev, "platform reg error %d\n", err); dev_err(dev, "platform reg error %d\n", err);
goto err_irq; return err;
} }
return 0; return 0;
err_irq:
snd_soc_unregister_component(dev);
return err;
} }
static int cygnus_ssp_remove(struct platform_device *pdev) static int cygnus_ssp_remove(struct platform_device *pdev)
{ {
cygnus_soc_platform_unregister(&pdev->dev); cygnus_soc_platform_unregister(&pdev->dev);
snd_soc_unregister_component(&pdev->dev);
return 0; return 0;
} }