Commit 642a722d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: omap: 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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bfacaa8c
...@@ -348,7 +348,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev) ...@@ -348,7 +348,7 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
default: default:
return -EINVAL; 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); dai_drv, 1);
if (ret) if (ret)
return ret; return ret;
...@@ -383,7 +383,6 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev) ...@@ -383,7 +383,6 @@ static int omap_hdmi_audio_probe(struct platform_device *pdev)
ret = snd_soc_register_card(card); ret = snd_soc_register_card(card);
if (ret) { if (ret) {
dev_err(dev, "snd_soc_register_card failed (%d)\n", ret); dev_err(dev, "snd_soc_register_card failed (%d)\n", ret);
snd_soc_unregister_component(ad->dssdev);
return ret; return ret;
} }
...@@ -400,7 +399,6 @@ static int omap_hdmi_audio_remove(struct platform_device *pdev) ...@@ -400,7 +399,6 @@ static int omap_hdmi_audio_remove(struct platform_device *pdev)
struct hdmi_audio_data *ad = platform_get_drvdata(pdev); struct hdmi_audio_data *ad = platform_get_drvdata(pdev);
snd_soc_unregister_card(ad->card); snd_soc_unregister_card(ad->card);
snd_soc_unregister_component(ad->dssdev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment