diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:35:11 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:57:30 -0400 |
commit | 5642ddff274172b42bb9d1f77b75e006a33b65b2 (patch) | |
tree | 9b428e0be3681e5c2d83b9be8669176fba0cbd51 | |
parent | cd5e4d0b2f7065eaef56725ebcd6bf3278d33b20 (diff) |
ASoC: switch over to use snd_soc_register_component() on s3c24xx 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/samsung/s3c24xx-i2s.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index 13f6dd1ceb00..5403176b2aa3 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c | |||
@@ -465,11 +465,16 @@ static struct snd_soc_dai_driver s3c24xx_i2s_dai = { | |||
465 | .ops = &s3c24xx_i2s_dai_ops, | 465 | .ops = &s3c24xx_i2s_dai_ops, |
466 | }; | 466 | }; |
467 | 467 | ||
468 | static const struct snd_soc_component_driver s3c24xx_i2s_component = { | ||
469 | .name = "s3c24xx-i2s", | ||
470 | }; | ||
471 | |||
468 | static int s3c24xx_iis_dev_probe(struct platform_device *pdev) | 472 | static int s3c24xx_iis_dev_probe(struct platform_device *pdev) |
469 | { | 473 | { |
470 | int ret = 0; | 474 | int ret = 0; |
471 | 475 | ||
472 | ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai); | 476 | ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, |
477 | &s3c24xx_i2s_dai, 1); | ||
473 | if (ret) { | 478 | if (ret) { |
474 | pr_err("failed to register the dai\n"); | 479 | pr_err("failed to register the dai\n"); |
475 | return ret; | 480 | return ret; |
@@ -483,14 +488,14 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) | |||
483 | 488 | ||
484 | return 0; | 489 | return 0; |
485 | err: | 490 | err: |
486 | snd_soc_unregister_dai(&pdev->dev); | 491 | snd_soc_unregister_component(&pdev->dev); |
487 | return ret; | 492 | return ret; |
488 | } | 493 | } |
489 | 494 | ||
490 | static int s3c24xx_iis_dev_remove(struct platform_device *pdev) | 495 | static int s3c24xx_iis_dev_remove(struct platform_device *pdev) |
491 | { | 496 | { |
492 | asoc_dma_platform_unregister(&pdev->dev); | 497 | asoc_dma_platform_unregister(&pdev->dev); |
493 | snd_soc_unregister_dai(&pdev->dev); | 498 | snd_soc_unregister_component(&pdev->dev); |
494 | return 0; | 499 | return 0; |
495 | } | 500 | } |
496 | 501 | ||