diff options
Diffstat (limited to 'sound/soc/mxs/mxs-saif.c')
-rw-r--r-- | sound/soc/mxs/mxs-saif.c | 11 |
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 | ||
630 | static const struct snd_soc_component_driver mxs_saif_component = { | ||
631 | .name = "mxs-saif", | ||
632 | }; | ||
633 | |||
630 | static irqreturn_t mxs_saif_irq(int irq, void *dev_id) | 634 | static 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 | ||
780 | failed_pdev_alloc: | 785 | failed_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: | |||
786 | static int mxs_saif_remove(struct platform_device *pdev) | 791 | static 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 | } |