aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 06:34:01 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 17:57:26 -0400
commit0ba7f849eceed0564928f83aa8ec51906e69336d (patch)
tree8b73b15d7d3a9257f4715cf78a38f4ae27a68dca
parented22853a5bf51736e5f7e42fddacd053e38ddf01 (diff)
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>
-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 = {
264 .ops = &omap_hdmi_dai_ops, 264 .ops = &omap_hdmi_dai_ops,
265}; 265};
266 266
267static const struct snd_soc_component_driver omap_hdmi_component = {
268 .name = DRV_NAME,
269};
270
267static int omap_hdmi_probe(struct platform_device *pdev) 271static int omap_hdmi_probe(struct platform_device *pdev)
268{ 272{
269 int ret; 273 int ret;
@@ -321,7 +325,8 @@ static int omap_hdmi_probe(struct platform_device *pdev)
321 } 325 }
322 326
323 dev_set_drvdata(&pdev->dev, hdmi_data); 327 dev_set_drvdata(&pdev->dev, hdmi_data);
324 ret = snd_soc_register_dai(&pdev->dev, &omap_hdmi_dai); 328 ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component,
329 &omap_hdmi_dai, 1);
325 330
326 return ret; 331 return ret;
327} 332}
@@ -330,7 +335,7 @@ static int omap_hdmi_remove(struct platform_device *pdev)
330{ 335{
331 struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev); 336 struct hdmi_priv *hdmi_data = dev_get_drvdata(&pdev->dev);
332 337
333 snd_soc_unregister_dai(&pdev->dev); 338 snd_soc_unregister_component(&pdev->dev);
334 339
335 if (hdmi_data == NULL) { 340 if (hdmi_data == NULL) {
336 dev_err(&pdev->dev, "cannot obtain HDMi data\n"); 341 dev_err(&pdev->dev, "cannot obtain HDMi data\n");