]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: cirrus: ep93xx-i2s.c: use devm_snd_soc_register_component()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 28 Jun 2019 04:09:00 +0000 (13:09 +0900)
committerMark Brown <broonie@kernel.org>
Tue, 2 Jul 2019 12:48:39 +0000 (13:48 +0100)
We have devm_xxx version of snd_soc_register_component,
let's use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/cirrus/ep93xx-i2s.c

index 6ca899ba9484f1e32c3078e065aa8ef873324098..0b4355e95f84208f5db0c53e6e394e841462e737 100644 (file)
@@ -473,19 +473,17 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
 
        dev_set_drvdata(&pdev->dev, info);
 
-       err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
+       err = devm_snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component,
                                         &ep93xx_i2s_dai, 1);
        if (err)
                goto fail_put_lrclk;
 
        err = devm_ep93xx_pcm_platform_register(&pdev->dev);
        if (err)
-               goto fail_unregister;
+               goto fail_put_lrclk;
 
        return 0;
 
-fail_unregister:
-       snd_soc_unregister_component(&pdev->dev);
 fail_put_lrclk:
        clk_put(info->lrclk);
 fail_put_sclk:
@@ -500,7 +498,6 @@ static int ep93xx_i2s_remove(struct platform_device *pdev)
 {
        struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
 
-       snd_soc_unregister_component(&pdev->dev);
        clk_put(info->lrclk);
        clk_put(info->sclk);
        clk_put(info->mclk);