leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: atmel_ssc_dai: use devm_snd_soc_register_component()

Browse Source 
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:15 +00:00 committed by Mark Brown
parent 0712e0288b
commit e14614dc51
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/soc/atmel/atmel_ssc_dai.c
View File

@ -1005,11 +1005,11 @@ static int asoc_ssc_init(struct device *dev)
struct ssc_device *ssc = dev_get_drvdata(dev); struct ssc_device *ssc = dev_get_drvdata(dev);
int ret; int ret;
ret = snd_soc_register_component(dev, &atmel_ssc_component, ret = devm_snd_soc_register_component(dev, &atmel_ssc_component,
&atmel_ssc_dai, 1); &atmel_ssc_dai, 1);
if (ret) { if (ret) {
dev_err(dev, "Could not register DAI: %d\n", ret); dev_err(dev, "Could not register DAI: %d\n", ret);
goto err; return ret;
} }
if (ssc->pdata->use_dma) if (ssc->pdata->use_dma)
@ -1019,15 +1019,10 @@ static int asoc_ssc_init(struct device *dev)
if (ret) { if (ret) {
dev_err(dev, "Could not register PCM: %d\n", ret); dev_err(dev, "Could not register PCM: %d\n", ret);
goto err_unregister_dai; return ret;
} }
return 0; return 0;
err_unregister_dai:
snd_soc_unregister_component(dev);
err:
return ret;
} }
static void asoc_ssc_exit(struct device *dev) static void asoc_ssc_exit(struct device *dev)
@ -1038,8 +1033,6 @@ static void asoc_ssc_exit(struct device *dev)
atmel_pcm_dma_platform_unregister(dev); atmel_pcm_dma_platform_unregister(dev);
else else
atmel_pcm_pdc_platform_unregister(dev); atmel_pcm_pdc_platform_unregister(dev);
snd_soc_unregister_component(dev);
} }
/** /**