diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 03:35:11 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 21:57:30 +0000 |
| commit | 5642ddff274172b42bb9d1f77b75e006a33b65b2 (patch) | |
| tree | 9b428e0be3681e5c2d83b9be8669176fba0cbd51 | |
| parent | cd5e4d0b2f7065eaef56725ebcd6bf3278d33b20 (diff) | |
| download | kernel_goldelico_gta04-5642ddff274172b42bb9d1f77b75e006a33b65b2.zip kernel_goldelico_gta04-5642ddff274172b42bb9d1f77b75e006a33b65b2.tar.gz kernel_goldelico_gta04-5642ddff274172b42bb9d1f77b75e006a33b65b2.tar.bz2 | |
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 13f6dd1..5403176 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 = { .ops = &s3c24xx_i2s_dai_ops, }; +static const struct snd_soc_component_driver s3c24xx_i2s_component = { + .name = "s3c24xx-i2s", +}; + static int s3c24xx_iis_dev_probe(struct platform_device *pdev) { int ret = 0; - ret = snd_soc_register_dai(&pdev->dev, &s3c24xx_i2s_dai); + ret = snd_soc_register_component(&pdev->dev, &s3c24xx_i2s_component, + &s3c24xx_i2s_dai, 1); if (ret) { pr_err("failed to register the dai\n"); return ret; @@ -483,14 +488,14 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) return 0; err: - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return ret; } static int s3c24xx_iis_dev_remove(struct platform_device *pdev) { asoc_dma_platform_unregister(&pdev->dev); - snd_soc_unregister_dai(&pdev->dev); + snd_soc_unregister_component(&pdev->dev); return 0; } |