diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 03:28:24 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 21:55:23 +0000 |
| commit | a2c662c0e5df335010a9bfa1a0c43332fadebe4b (patch) | |
| tree | b216e75dd1609b3e1ca0fe32407f7f161f98870e | |
| parent | f298a0ffa4b6169d665721962cd0723e34078be0 (diff) | |
| download | linux-3.10-a2c662c0e5df335010a9bfa1a0c43332fadebe4b.tar.gz linux-3.10-a2c662c0e5df335010a9bfa1a0c43332fadebe4b.tar.bz2 linux-3.10-a2c662c0e5df335010a9bfa1a0c43332fadebe4b.zip | |
ASoC: switch over to use snd_soc_register_component() on atmel ssc
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/atmel/atmel_ssc_dai.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c index e13580d6c47..1435f3067d1 100644 --- a/sound/soc/atmel/atmel_ssc_dai.c +++ b/sound/soc/atmel/atmel_ssc_dai.c @@ -707,13 +707,18 @@ static struct snd_soc_dai_driver atmel_ssc_dai = { .ops = &atmel_ssc_dai_ops, }; +static const struct snd_soc_component_driver atmel_ssc_component = { + .name = "atmel-ssc", +}; + static int asoc_ssc_init(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct ssc_device *ssc = platform_get_drvdata(pdev); int ret; - ret = snd_soc_register_dai(dev, &atmel_ssc_dai); + ret = snd_soc_register_component(dev, &atmel_ssc_component, + &atmel_ssc_dai, 1); if (ret) { dev_err(dev, "Could not register DAI: %d\n", ret); goto err; @@ -732,7 +737,7 @@ static int asoc_ssc_init(struct device *dev) return 0; err_unregister_dai: - snd_soc_unregister_dai(dev); + snd_soc_unregister_component(dev); err: return ret; } @@ -747,7 +752,7 @@ static void asoc_ssc_exit(struct device *dev) else atmel_pcm_pdc_platform_unregister(dev); - snd_soc_unregister_dai(dev); + snd_soc_unregister_component(dev); } /** |