aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2013-03-21 06:33:02 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 17:57:21 -0400
commit026240bb155bb8f83b9425812f52661fcbaa0629 (patch)
tree2a5332779e6ea2bbb3740c8f14f96afbc010f06c
parentb1c36861315ce37c2fee8c1c90433068866a8871 (diff)
ASoC: switch over to use snd_soc_register_component() on mxs saif
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/mxs/mxs-saif.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 3a2aa1d19b93..3e78ba866681 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -627,6 +627,10 @@ static struct snd_soc_dai_driver mxs_saif_dai = {
627 .ops = &mxs_saif_dai_ops, 627 .ops = &mxs_saif_dai_ops,
628}; 628};
629 629
630static const struct snd_soc_component_driver mxs_saif_component = {
631 .name = "mxs-saif",
632};
633
630static irqreturn_t mxs_saif_irq(int irq, void *dev_id) 634static irqreturn_t mxs_saif_irq(int irq, void *dev_id)
631{ 635{
632 struct mxs_saif *saif = dev_id; 636 struct mxs_saif *saif = dev_id;
@@ -763,7 +767,8 @@ static int mxs_saif_probe(struct platform_device *pdev)
763 767
764 platform_set_drvdata(pdev, saif); 768 platform_set_drvdata(pdev, saif);
765 769
766 ret = snd_soc_register_dai(&pdev->dev, &mxs_saif_dai); 770 ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
771 &mxs_saif_dai, 1);
767 if (ret) { 772 if (ret) {
768 dev_err(&pdev->dev, "register DAI failed\n"); 773 dev_err(&pdev->dev, "register DAI failed\n");
769 return ret; 774 return ret;
@@ -778,7 +783,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
778 return 0; 783 return 0;
779 784
780failed_pdev_alloc: 785failed_pdev_alloc:
781 snd_soc_unregister_dai(&pdev->dev); 786 snd_soc_unregister_component(&pdev->dev);
782 787
783 return ret; 788 return ret;
784} 789}
@@ -786,7 +791,7 @@ failed_pdev_alloc:
786static int mxs_saif_remove(struct platform_device *pdev) 791static int mxs_saif_remove(struct platform_device *pdev)
787{ 792{
788 mxs_pcm_platform_unregister(&pdev->dev); 793 mxs_pcm_platform_unregister(&pdev->dev);
789 snd_soc_unregister_dai(&pdev->dev); 794 snd_soc_unregister_component(&pdev->dev);
790 795
791 return 0; 796 return 0;
792} 797}