diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2013-03-21 06:28:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-26 17:55:23 -0400 |
commit | a2c662c0e5df335010a9bfa1a0c43332fadebe4b (patch) | |
tree | b216e75dd1609b3e1ca0fe32407f7f161f98870e | |
parent | f298a0ffa4b6169d665721962cd0723e34078be0 (diff) |
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 e13580d6c476..1435f3067d16 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 = { | |||
707 | .ops = &atmel_ssc_dai_ops, | 707 | .ops = &atmel_ssc_dai_ops, |
708 | }; | 708 | }; |
709 | 709 | ||
710 | static const struct snd_soc_component_driver atmel_ssc_component = { | ||
711 | .name = "atmel-ssc", | ||
712 | }; | ||
713 | |||
710 | static int asoc_ssc_init(struct device *dev) | 714 | static int asoc_ssc_init(struct device *dev) |
711 | { | 715 | { |
712 | struct platform_device *pdev = to_platform_device(dev); | 716 | struct platform_device *pdev = to_platform_device(dev); |
713 | struct ssc_device *ssc = platform_get_drvdata(pdev); | 717 | struct ssc_device *ssc = platform_get_drvdata(pdev); |
714 | int ret; | 718 | int ret; |
715 | 719 | ||
716 | ret = snd_soc_register_dai(dev, &atmel_ssc_dai); | 720 | ret = snd_soc_register_component(dev, &atmel_ssc_component, |
721 | &atmel_ssc_dai, 1); | ||
717 | if (ret) { | 722 | if (ret) { |
718 | dev_err(dev, "Could not register DAI: %d\n", ret); | 723 | dev_err(dev, "Could not register DAI: %d\n", ret); |
719 | goto err; | 724 | goto err; |
@@ -732,7 +737,7 @@ static int asoc_ssc_init(struct device *dev) | |||
732 | return 0; | 737 | return 0; |
733 | 738 | ||
734 | err_unregister_dai: | 739 | err_unregister_dai: |
735 | snd_soc_unregister_dai(dev); | 740 | snd_soc_unregister_component(dev); |
736 | err: | 741 | err: |
737 | return ret; | 742 | return ret; |
738 | } | 743 | } |
@@ -747,7 +752,7 @@ static void asoc_ssc_exit(struct device *dev) | |||
747 | else | 752 | else |
748 | atmel_pcm_pdc_platform_unregister(dev); | 753 | atmel_pcm_pdc_platform_unregister(dev); |
749 | 754 | ||
750 | snd_soc_unregister_dai(dev); | 755 | snd_soc_unregister_component(dev); |
751 | } | 756 | } |
752 | 757 | ||
753 | /** | 758 | /** |