ASoC: multi-component - ASoC Multi-Component Support

[mv-sheeva.git] / sound / soc / codecs / spdif_transciever.c

diff --git a/sound/soc/codecs/spdif_transciever.c b/sound/soc/codecs/spdif_transciever.c
index 9119836051a4721abef78468869c07b7bdc409a8..4c32b54913ad0f6316de3bea2f4e03a558fe8ec6 100644 (file)
--- a/sound/soc/codecs/spdif_transciever.c
+++ b/sound/soc/codecs/spdif_transciever.c
@@ -21,57 +21,16 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 
-#include "spdif_transciever.h"
-
 MODULE_LICENSE("GPL");
 
 #define STUB_RATES     SNDRV_PCM_RATE_8000_96000
 #define STUB_FORMATS   SNDRV_PCM_FMTBIT_S16_LE
 
-static struct snd_soc_codec *spdif_dit_codec;
-
-static int spdif_dit_codec_probe(struct platform_device *pdev)
-{
-       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-       struct snd_soc_codec *codec;
-       int ret;
-
-       if (spdif_dit_codec == NULL) {
-               dev_err(&pdev->dev, "Codec device not registered\n");
-               return -ENODEV;
-       }
-
-       socdev->card->codec = spdif_dit_codec;
-       codec = spdif_dit_codec;
-
-       ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-       if (ret < 0) {
-               dev_err(codec->dev, "failed to create pcms: %d\n", ret);
-               goto err_create_pcms;
-       }
-
-       return 0;
-
-err_create_pcms:
-       return ret;
-}
-
-static int spdif_dit_codec_remove(struct platform_device *pdev)
-{
-       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-
-       snd_soc_free_pcms(socdev);
-
-       return 0;
-}
 
-struct snd_soc_codec_device soc_codec_dev_spdif_dit = {
-       .probe          = spdif_dit_codec_probe,
-       .remove         = spdif_dit_codec_remove,
-}; EXPORT_SYMBOL_GPL(soc_codec_dev_spdif_dit);
+static struct snd_soc_codec_driver soc_codec_spdif_dit;
 
-struct snd_soc_dai dit_stub_dai = {
-       .name           = "DIT",
+static struct snd_soc_dai_driver dit_stub_dai = {
+       .name           = "dit-hifi",
        .playback       = {
                .stream_name    = "Playback",
                .channels_min   = 1,
@@ -80,65 +39,16 @@ struct snd_soc_dai dit_stub_dai = {
                .formats        = STUB_FORMATS,
        },
 };
-EXPORT_SYMBOL_GPL(dit_stub_dai);
 
 static int spdif_dit_probe(struct platform_device *pdev)
 {
-       struct snd_soc_codec *codec;
-       int ret;
-
-       if (spdif_dit_codec) {
-               dev_err(&pdev->dev, "Another Codec is registered\n");
-               ret = -EINVAL;
-               goto err_reg_codec;
-       }
-
-       codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-       if (codec == NULL)
-               return -ENOMEM;
-
-       codec->dev = &pdev->dev;
-
-       mutex_init(&codec->mutex);
-
-       INIT_LIST_HEAD(&codec->dapm_widgets);
-       INIT_LIST_HEAD(&codec->dapm_paths);
-
-       codec->name = "spdif-dit";
-       codec->owner = THIS_MODULE;
-       codec->dai = &dit_stub_dai;
-       codec->num_dai = 1;
-
-       spdif_dit_codec = codec;
-
-       ret = snd_soc_register_codec(codec);
-       if (ret < 0) {
-               dev_err(codec->dev, "Failed to register codec: %d\n", ret);
-               goto err_reg_codec;
-       }
-
-       dit_stub_dai.dev = &pdev->dev;
-       ret = snd_soc_register_dai(&dit_stub_dai);
-       if (ret < 0) {
-               dev_err(codec->dev, "Failed to register dai: %d\n", ret);
-               goto err_reg_dai;
-       }
-
-       return 0;
-
-err_reg_dai:
-       snd_soc_unregister_codec(codec);
-err_reg_codec:
-       kfree(spdif_dit_codec);
-       return ret;
+       return snd_soc_register_codec(&pdev->dev, &soc_codec_spdif_dit,
+                       &dit_stub_dai, 1);
 }
 
 static int spdif_dit_remove(struct platform_device *pdev)
 {
-       snd_soc_unregister_dai(&dit_stub_dai);
-       snd_soc_unregister_codec(spdif_dit_codec);
-       kfree(spdif_dit_codec);
-       spdif_dit_codec = NULL;
+       snd_soc_unregister_codec(&pdev->dev);
        return 0;
 }