Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ba7f849 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: switch over to use snd_soc_register_component() on omap hdmi 



Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent ed22853a

sound/soc/omap/omap-hdmi.c

+7 −2
Original line number Diff line number Diff line
@@ -264,6 +264,10 @@ static struct snd_soc_dai_driver omap_hdmi_dai = { 
	.ops = &omap_hdmi_dai_ops,

};



static const struct snd_soc_component_driver omap_hdmi_component = {

	.name		= DRV_NAME,

};



static int omap_hdmi_probe(struct platform_device *pdev)

{

	int ret;
@@ -321,7 +325,8 @@ static int omap_hdmi_probe(struct platform_device *pdev) 
	}



	dev_set_drvdata(&pdev->dev, hdmi_data);

	ret = snd_soc_register_dai(&pdev->dev, &omap_hdmi_dai);

	ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component,

					 &omap_hdmi_dai, 1);



	return ret;

}
@@ -330,7 +335,7 @@ static int omap_hdmi_remove(struct platform_device *pdev) 
{

	struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev);



	snd_soc_unregister_dai(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	if (hdmi_data == NULL) {

		dev_err(&pdev->dev, "cannot obtain HDMi data\n");