aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/atmel
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r--sound/soc/atmel/atmel_ssc_dai.c11
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 94da62345a27..f3fdfa07fcb9 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -750,13 +750,18 @@ static struct snd_soc_dai_driver atmel_ssc_dai = {
750 .ops = &atmel_ssc_dai_ops, 750 .ops = &atmel_ssc_dai_ops,
751}; 751};
752 752
753static const struct snd_soc_component_driver atmel_ssc_component = {
754 .name = "atmel-ssc",
755};
756
753static int asoc_ssc_init(struct device *dev) 757static int asoc_ssc_init(struct device *dev)
754{ 758{
755 struct platform_device *pdev = to_platform_device(dev); 759 struct platform_device *pdev = to_platform_device(dev);
756 struct ssc_device *ssc = platform_get_drvdata(pdev); 760 struct ssc_device *ssc = platform_get_drvdata(pdev);
757 int ret; 761 int ret;
758 762
759 ret = snd_soc_register_dai(dev, &atmel_ssc_dai); 763 ret = snd_soc_register_component(dev, &atmel_ssc_component,
764 &atmel_ssc_dai, 1);
760 if (ret) { 765 if (ret) {
761 dev_err(dev, "Could not register DAI: %d\n", ret); 766 dev_err(dev, "Could not register DAI: %d\n", ret);
762 goto err; 767 goto err;
@@ -775,7 +780,7 @@ static int asoc_ssc_init(struct device *dev)
775 return 0; 780 return 0;
776 781
777err_unregister_dai: 782err_unregister_dai:
778 snd_soc_unregister_dai(dev); 783 snd_soc_unregister_component(dev);
779err: 784err:
780 return ret; 785 return ret;
781} 786}
@@ -790,7 +795,7 @@ static void asoc_ssc_exit(struct device *dev)
790 else 795 else
791 atmel_pcm_pdc_platform_unregister(dev); 796 atmel_pcm_pdc_platform_unregister(dev);
792 797
793 snd_soc_unregister_dai(dev); 798 snd_soc_unregister_component(dev);
794} 799}
795 800
796/** 801/**