CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/samsung/smdk_spdif.c

 /*
  * smdk_spdif.c  --  S/PDIF audio for SMDK
  *
  * Copyright 2010 Samsung Electronics Co. Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  */
 
-#include <linux/module.h>
-#include <linux/device.h>
 #include <linux/clk.h>
 
-#include <plat/devs.h>
-
 #include <sound/soc.h>
 
-#include "s3c-dma.h"
 #include "spdif.h"
 
 /* Audio clock settings are belonged to board specific part. Every
  * board can set audio source clock setting which is matched with H/W
  * like this function-'set_audio_clock_heirachy'.
  */
 static int set_audio_clock_heirachy(struct platform_device *pdev)
 {
         struct clk *fout_epll, *mout_epll, *sclk_audio0, *sclk_spdif;
-        int ret;
+        int ret = 0;
 
         fout_epll = clk_get(NULL, "fout_epll");
         if (IS_ERR(fout_epll)) {
                 printk(KERN_WARNING "%s: Cannot find fout_epll.\n",
                                 __func__);
                 return -EINVAL;
         }
 
         mout_epll = clk_get(NULL, "mout_epll");
         if (IS_ERR(mout_epll)) {
@@ skipping 12 matching lines @@
         }
 
         sclk_spdif = clk_get(NULL, "sclk_spdif");
         if (IS_ERR(sclk_spdif)) {
                 printk(KERN_WARNING "%s: Cannot find sclk_spdif.\n",
                                 __func__);
                 ret = -EINVAL;
                 goto out3;
         }
 
-        /* Set audio clock heirachy for S/PDIF */
+        /* Set audio clock hierarchy for S/PDIF */
         clk_set_parent(mout_epll, fout_epll);
         clk_set_parent(sclk_audio0, mout_epll);
         clk_set_parent(sclk_spdif, sclk_audio0);
 
         clk_put(sclk_spdif);
 out3:
         clk_put(sclk_audio0);
 out2:
         clk_put(mout_epll);
 out1:
         clk_put(fout_epll);
 
         return ret;
 }
 
 /* We should haved to set clock directly on this part because of clock
  * scheme of Samsudng SoCs did not support to set rates from abstrct
- * clock of it's heirachy.
+ * clock of it's hierarchy.
  */
 static int set_audio_clock_rate(unsigned long epll_rate,
                                 unsigned long audio_rate)
 {
         struct clk *fout_epll, *sclk_spdif;
 
         fout_epll = clk_get(NULL, "fout_epll");
         if (IS_ERR(fout_epll)) {
                 printk(KERN_ERR "%s: failed to get fout_epll\n", __func__);
                 return -ENOENT;
@@ skipping 52 matching lines @@
         if (ret < 0)
                 return ret;
 
         return ret;
 }
 
 static struct snd_soc_ops smdk_spdif_ops = {
         .hw_params = smdk_hw_params,
 };
 
-static struct snd_soc_card smdk;
-
 static struct snd_soc_dai_link smdk_dai = {
         .name = "S/PDIF",
         .stream_name = "S/PDIF PCM Playback",
-        .platform_name = "s3c24xx-pcm-audio",
+        .platform_name = "samsung-audio",
         .cpu_dai_name = "samsung-spdif",
         .codec_dai_name = "dit-hifi",
         .codec_name = "spdif-dit",
         .ops = &smdk_spdif_ops,
 };
 
 static struct snd_soc_card smdk = {
         .name = "SMDK-S/PDIF",
         .dai_link = &smdk_dai,
         .num_links = 1,
 };
 
 static struct platform_device *smdk_snd_spdif_dit_device;
 static struct platform_device *smdk_snd_spdif_device;
 
 static int __init smdk_init(void)
 {
         int ret;
 
         smdk_snd_spdif_dit_device = platform_device_alloc("spdif-dit", -1);
         if (!smdk_snd_spdif_dit_device)
                 return -ENOMEM;
 
         ret = platform_device_add(smdk_snd_spdif_dit_device);
         if (ret)
-                goto err2;
+                goto err1;
 
         smdk_snd_spdif_device = platform_device_alloc("soc-audio", -1);
         if (!smdk_snd_spdif_device) {
                 ret = -ENOMEM;
                 goto err2;
         }
 
         platform_set_drvdata(smdk_snd_spdif_device, &smdk);
 
         ret = platform_device_add(smdk_snd_spdif_device);
         if (ret)
-                goto err1;
+                goto err3;
 
-        /* Set audio clock heirachy manually */
+        /* Set audio clock hierarchy manually */
         ret = set_audio_clock_heirachy(smdk_snd_spdif_device);
         if (ret)
-                goto err1;
+                goto err4;
 
         return 0;
-err1:
+err4:
+        platform_device_del(smdk_snd_spdif_device);
+err3:
         platform_device_put(smdk_snd_spdif_device);
 err2:
+        platform_device_del(smdk_snd_spdif_dit_device);
+err1:
         platform_device_put(smdk_snd_spdif_dit_device);
         return ret;
 }
 
 static void __exit smdk_exit(void)
 {
         platform_device_unregister(smdk_snd_spdif_device);
+        platform_device_unregister(smdk_snd_spdif_dit_device);
 }
 
 module_init(smdk_init);
 module_exit(smdk_exit);
 
 MODULE_AUTHOR("Seungwhan Youn, <sw.youn@samsung.com>");
 MODULE_DESCRIPTION("ALSA SoC SMDK+S/PDIF");
 MODULE_LICENSE("GPL");