summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-hdmi.c
diff options
context:
space:
mode:
authorKuninori Morimoto2013-03-21 11:34:01 +0100
committerMark Brown2013-03-26 22:57:26 +0100
commit0ba7f849eceed0564928f83aa8ec51906e69336d (patch)
tree8b73b15d7d3a9257f4715cf78a38f4ae27a68dca /sound/soc/omap/omap-hdmi.c
parentASoC: switch over to use snd_soc_register_component() on omap dmic (diff)
downloadkernel-qcow2-linux-0ba7f849eceed0564928f83aa8ec51906e69336d.tar.gz
kernel-qcow2-linux-0ba7f849eceed0564928f83aa8ec51906e69336d.tar.xz
kernel-qcow2-linux-0ba7f849eceed0564928f83aa8ec51906e69336d.zip
ASoC: switch over to use snd_soc_register_component() on omap hdmi
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap/omap-hdmi.c')
-rw-r--r--sound/soc/omap/omap-hdmi.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index 32fa840c493e..7e120ccc20e1 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -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");