diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:30:43 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:55:26 -0400 |
commit | ec05085170fcac5cba66306155083f120dec6ff6 (patch) | |
tree | 3fcdfb120ca7096bb4d5df9519ed466beb5348a5 | |
parent | 426c340853da49e7c55fe856408ea44f8852d8c8 (diff) |
ASoC: switch over to use snd_soc_register_component() on ep93xx i2s
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | sound/soc/cirrus/ep93xx-i2s.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index 323ed69b7975..8d244be275d6 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c | |||
@@ -366,6 +366,10 @@ static struct snd_soc_dai_driver ep93xx_i2s_dai = { | |||
366 | .ops = &ep93xx_i2s_dai_ops, | 366 | .ops = &ep93xx_i2s_dai_ops, |
367 | }; | 367 | }; |
368 | 368 | ||
369 | static const struct snd_soc_component_driver ep93xx_i2s_component = { | ||
370 | .name = "ep93xx-i2s", | ||
371 | }; | ||
372 | |||
369 | static int ep93xx_i2s_probe(struct platform_device *pdev) | 373 | static int ep93xx_i2s_probe(struct platform_device *pdev) |
370 | { | 374 | { |
371 | struct ep93xx_i2s_info *info; | 375 | struct ep93xx_i2s_info *info; |
@@ -405,7 +409,8 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) | |||
405 | dev_set_drvdata(&pdev->dev, info); | 409 | dev_set_drvdata(&pdev->dev, info); |
406 | info->dma_params = ep93xx_i2s_dma_params; | 410 | info->dma_params = ep93xx_i2s_dma_params; |
407 | 411 | ||
408 | err = snd_soc_register_dai(&pdev->dev, &ep93xx_i2s_dai); | 412 | err = snd_soc_register_component(&pdev->dev, &ep93xx_i2s_component, |
413 | &ep93xx_i2s_dai, 1); | ||
409 | if (err) | 414 | if (err) |
410 | goto fail_put_lrclk; | 415 | goto fail_put_lrclk; |
411 | 416 | ||
@@ -426,7 +431,7 @@ static int ep93xx_i2s_remove(struct platform_device *pdev) | |||
426 | { | 431 | { |
427 | struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev); | 432 | struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev); |
428 | 433 | ||
429 | snd_soc_unregister_dai(&pdev->dev); | 434 | snd_soc_unregister_component(&pdev->dev); |
430 | dev_set_drvdata(&pdev->dev, NULL); | 435 | dev_set_drvdata(&pdev->dev, NULL); |
431 | clk_put(info->lrclk); | 436 | clk_put(info->lrclk); |
432 | clk_put(info->sclk); | 437 | clk_put(info->sclk); |