Skip to content

Commit

Permalink
ASoC: switch over to use snd_soc_register_component() on omap hdmi
Browse files Browse the repository at this point in the history
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Mar 26, 2013
1 parent ed22853 commit 0ba7f84
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions sound/soc/omap/omap-hdmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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");
Expand Down

0 comments on commit 0ba7f84

Please sign in to comment.