Merge tag 'asoc-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / sound / soc / generic / simple-card.c

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index c0d9281..2a1b1b5 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -9,14 +9,12 @@
  * published by the Free Software Foundation.
  */
 #include <linux/clk.h>
+#include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
-#include <linux/module.h>
+#include <linux/string.h>
 #include <sound/simple_card.h>
 
-#define asoc_simple_get_card_info(p) \
-       container_of(p->dai_link, struct asoc_simple_card_info, snd_link)
-
 static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
                                       struct asoc_simple_dai *set,
                                       unsigned int daifmt)
@@ -41,7 +39,8 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
 
 static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct asoc_simple_card_info *info = asoc_simple_get_card_info(rtd);
+       struct asoc_simple_card_info *info =
+                               snd_soc_card_get_drvdata(rtd->card);
        struct snd_soc_dai *codec = rtd->codec_dai;
        struct snd_soc_dai *cpu = rtd->cpu_dai;
        unsigned int daifmt = info->daifmt;
@@ -106,12 +105,8 @@ asoc_simple_card_sub_parse_of(struct device_node *np,
                                     &dai->sysclk);
        } else {
                clk = of_clk_get(*node, 0);
-               if (IS_ERR(clk)) {
-                       ret = PTR_ERR(clk);
-                       goto parse_error;
-               }
-
-               dai->sysclk = clk_get_rate(clk);
+               if (!IS_ERR(clk))
+                       dai->sysclk = clk_get_rate(clk);
        }
 
        ret = 0;
@@ -138,10 +133,12 @@ static int asoc_simple_card_parse_of(struct device_node *node,
                (SND_SOC_DAIFMT_FORMAT_MASK | SND_SOC_DAIFMT_INV_MASK);
 
        /* DAPM routes */
-       ret = snd_soc_of_parse_audio_routing(&info->snd_card,
-                                       "simple-audio-routing");
-       if (ret)
-               return ret;
+       if (of_property_read_bool(node, "simple-audio-card,routing")) {
+               ret = snd_soc_of_parse_audio_routing(&info->snd_card,
+                                       "simple-audio-card,routing");
+               if (ret)
+                       return ret;
+       }
 
        /* CPU sub-node */
        ret = -EINVAL;
@@ -197,34 +194,37 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
        struct device_node *np = pdev->dev.of_node;
        struct device_node *of_cpu, *of_codec, *of_platform;
        struct device *dev = &pdev->dev;
+       int ret;
 
        cinfo           = NULL;
        of_cpu          = NULL;
        of_codec        = NULL;
        of_platform     = NULL;
+
+       cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL);
+       if (!cinfo)
+               return -ENOMEM;
+
        if (np && of_device_is_available(np)) {
-               cinfo = devm_kzalloc(dev, sizeof(*cinfo), GFP_KERNEL);
-               if (cinfo) {
-                       int ret;
-                       cinfo->snd_card.dev = &pdev->dev;
-                       ret = asoc_simple_card_parse_of(np, cinfo, dev,
-                                                       &of_cpu,
-                                                       &of_codec,
-                                                       &of_platform);
-                       if (ret < 0) {
-                               if (ret != -EPROBE_DEFER)
-                                       dev_err(dev, "parse error %d\n", ret);
-                               return ret;
-                       }
+               cinfo->snd_card.dev = dev;
+
+               ret = asoc_simple_card_parse_of(np, cinfo, dev,
+                                               &of_cpu,
+                                               &of_codec,
+                                               &of_platform);
+               if (ret < 0) {
+                       if (ret != -EPROBE_DEFER)
+                               dev_err(dev, "parse error %d\n", ret);
+                       return ret;
                }
        } else {
-               cinfo->snd_card.dev = &pdev->dev;
-               cinfo = pdev->dev.platform_data;
-       }
+               if (!dev->platform_data) {
+                       dev_err(dev, "no info for asoc-simple-card\n");
+                       return -EINVAL;
+               }
 
-       if (!cinfo) {
-               dev_err(dev, "no info for asoc-simple-card\n");
-               return -EINVAL;
+               memcpy(cinfo, dev->platform_data, sizeof(*cinfo));
+               cinfo->snd_card.dev = dev;
        }
 
        if (!cinfo->name        ||
@@ -259,6 +259,8 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
        cinfo->snd_card.dai_link        = &cinfo->snd_link;
        cinfo->snd_card.num_links       = 1;
 
+       snd_soc_card_set_drvdata(&cinfo->snd_card, cinfo);
+
        return devm_snd_soc_register_card(&pdev->dev, &cinfo->snd_card);
 }