Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[linux-2.6-omap-h63xx.git] / sound / soc / codecs / pcm3008.c

diff --git a/sound/soc/codecs/pcm3008.c b/sound/soc/codecs/pcm3008.c
index 2b26e1d80c8d4392cefdabd23ef07474639ce095..9a3e67e5319cccb6ff176def3bcc5f2403b78a1c 100644 (file)
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
@@ -33,7 +33,6 @@
 
 struct snd_soc_dai pcm3008_dai = {
        .name = "PCM3008 HiFi",
-       .type = SND_SOC_DAI_I2S,
        .playback = {
                .stream_name = "PCM3008 Playback",
                .channels_min = 1,
@@ -92,7 +91,7 @@ static int pcm3008_soc_probe(struct platform_device *pdev)
        }
 
        /* Register Card. */
-       ret = snd_soc_register_card(socdev);
+       ret = snd_soc_init_card(socdev);
        if (ret < 0) {
                printk(KERN_ERR "pcm3008: failed to register card\n");
                goto card_err;
@@ -196,6 +195,18 @@ struct snd_soc_codec_device soc_codec_dev_pcm3008 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_pcm3008);
 
+static int __init pcm3008_init(void)
+{
+       return snd_soc_register_dai(&pcm3008_dai);
+}
+module_init(pcm3008_init);
+
+static void __exit pcm3008_exit(void)
+{
+       snd_soc_unregister_dai(&pcm3008_dai);
+}
+module_exit(pcm3008_exit);
+
 MODULE_DESCRIPTION("Soc PCM3008 driver");
 MODULE_AUTHOR("Hugo Villeneuve");
 MODULE_LICENSE("GPL");