ASoC: omap: use devm_snd_soc_register_component()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 7 Sep 2018 01:02:54 +0000 (01:02 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 10 Sep 2018 14:14:23 +0000 (15:14 +0100)
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>
sound/soc/omap/omap-hdmi-audio.c

index 8a99a8837dc9a48dc86a40883c0010ac7f239930..673a9eb153b22e0e1e4572735abda3efe2c63871 100644 (file)
@@ -348,7 +348,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
        default:
                return -EINVAL;
        }
-       ret = snd_soc_register_component(ad->dssdev, &omap_hdmi_component,
+       ret = devm_snd_soc_register_component(ad->dssdev, &omap_hdmi_component,
                                         dai_drv, 1);
        if (ret)
                return ret;
@@ -383,7 +383,6 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
        ret = snd_soc_register_card(card);
        if (ret) {
                dev_err(dev, "snd_soc_register_card failed (%d)\n", ret);
-               snd_soc_unregister_component(ad->dssdev);
                return ret;
        }
 
@@ -400,7 +399,6 @@ static int omap_hdmi_audio_remove(struct platform_device *pdev)
        struct hdmi_audio_data *ad = platform_get_drvdata(pdev);
 
        snd_soc_unregister_card(ad->card);
-       snd_soc_unregister_component(ad->dssdev);
        return 0;
 }