ASoC: rsrc-card: use asoc_simple_card_clean_reference()

[deliverable/linux.git] / sound / soc / sh / rcar / rsrc-card.c

diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c
index ed5391f4128070eacde151c15e3de8683770e796..16dc13e0bec9e237a5dbaafec26818a4de05ec82 100644 (file)
--- a/sound/soc/sh/rcar/rsrc-card.c
+++ b/sound/soc/sh/rcar/rsrc-card.c
@@ -62,6 +62,9 @@ struct rsrc_card_priv {
 #define rsrc_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i))
 #define rsrc_priv_to_props(priv, i) ((priv)->dai_props + (i))
 
+#define DAI    "sound-dai"
+#define CELL   "#sound-dai-cells"
+
 static int rsrc_card_startup(struct snd_pcm_substream *substream)
 {
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
@@ -94,7 +97,6 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_dai_link *dai_link;
        struct asoc_simple_dai *dai_props;
        int num = rtd->num;
-       int ret;
 
        dai_link        = rsrc_priv_to_link(priv, num);
        dai_props       = rsrc_priv_to_props(priv, num);
@@ -102,30 +104,7 @@ static int rsrc_card_dai_init(struct snd_soc_pcm_runtime *rtd)
                                rtd->cpu_dai :
                                rtd->codec_dai;
 
-       if (dai_props->sysclk) {
-               ret = snd_soc_dai_set_sysclk(dai, 0, dai_props->sysclk, 0);
-               if (ret && ret != -ENOTSUPP) {
-                       dev_err(dai->dev, "set_sysclk error\n");
-                       goto err;
-               }
-       }
-
-       if (dai_props->slots) {
-               ret = snd_soc_dai_set_tdm_slot(dai,
-                                              dai_props->tx_slot_mask,
-                                              dai_props->rx_slot_mask,
-                                              dai_props->slots,
-                                              dai_props->slot_width);
-               if (ret && ret != -ENOTSUPP) {
-                       dev_err(dai->dev, "set_tdm_slot error\n");
-                       goto err;
-               }
-       }
-
-       ret = 0;
-
-err:
-       return ret;
+       return asoc_simple_card_init_dai(dai, dai_props);
 }
 
 static int rsrc_card_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
@@ -155,18 +134,8 @@ static int rsrc_card_parse_links(struct device_node *np,
        struct device *dev = rsrc_priv_to_dev(priv);
        struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx);
        struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx);
-       struct of_phandle_args args;
        int ret;
 
-       /*
-        * Get node via "sound-dai = <&phandle port>"
-        * it will be used as xxx_of_node on soc_bind_dai_link()
-        */
-       ret = of_parse_phandle_with_args(np, "sound-dai",
-                                        "#sound-dai-cells", 0, &args);
-       if (ret)
-               return ret;
-
        /* Parse TDM slot */
        ret = snd_soc_of_parse_tdm_slot(np,
                                        &dai_props->tx_slot_mask,
@@ -177,6 +146,8 @@ static int rsrc_card_parse_links(struct device_node *np,
                return ret;
 
        if (is_fe) {
+               int is_single_links = 0;
+
                /* BE is dummy */
                dai_link->codec_of_node         = NULL;
                dai_link->codec_dai_name        = "snd-soc-dummy-dai";
@@ -185,9 +156,10 @@ static int rsrc_card_parse_links(struct device_node *np,
                /* FE settings */
                dai_link->dynamic               = 1;
                dai_link->dpcm_merged_format    = 1;
-               dai_link->cpu_of_node           = args.np;
-               ret = snd_soc_of_get_dai_name(np, &dai_link->cpu_dai_name);
-               if (ret < 0)
+
+               ret = asoc_simple_card_parse_cpu(np, dai_link, DAI, CELL,
+                                                &is_single_links);
+               if (ret)
                        return ret;
 
                ret = asoc_simple_card_parse_clk_cpu(np, dai_link, dai_props);
@@ -200,17 +172,7 @@ static int rsrc_card_parse_links(struct device_node *np,
                if (ret < 0)
                        return ret;
 
-               /*
-                * In soc_bind_dai_link() will check cpu name after
-                * of_node matching if dai_link has cpu_dai_name.
-                * but, it will never match if name was created by
-                * fmt_single_name() remove cpu_dai_name if cpu_args
-                * was 0. See:
-                *      fmt_single_name()
-                *      fmt_multiple_name()
-                */
-               if (!args.args_count)
-                       dai_link->cpu_dai_name = NULL;
+               asoc_simple_card_canonicalize_cpu(dai_link, is_single_links);
        } else {
                const struct rsrc_card_of_data *of_data;
 
@@ -224,8 +186,8 @@ static int rsrc_card_parse_links(struct device_node *np,
                /* BE settings */
                dai_link->no_pcm                = 1;
                dai_link->be_hw_params_fixup    = rsrc_card_be_hw_params_fixup;
-               dai_link->codec_of_node         = args.np;
-               ret = snd_soc_of_get_dai_name(np, &dai_link->codec_dai_name);
+
+               ret = asoc_simple_card_parse_codec(np, dai_link, DAI, CELL);
                if (ret < 0)
                        return ret;
 
@@ -251,8 +213,10 @@ static int rsrc_card_parse_links(struct device_node *np,
                }
        }
 
-       /* Simple Card assumes platform == cpu */
-       dai_link->platform_of_node      = dai_link->cpu_of_node;
+       ret = asoc_simple_card_canonicalize_dailink(dai_link);
+       if (ret < 0)
+               return ret;
+
        dai_link->dpcm_playback         = 1;
        dai_link->dpcm_capture          = 1;
        dai_link->ops                   = &rsrc_card_ops;
@@ -369,21 +333,6 @@ static int rsrc_card_parse_of(struct device_node *node,
        return 0;
 }
 
-/* Decrease the reference count of the device nodes */
-static int rsrc_card_unref(struct snd_soc_card *card)
-{
-       struct snd_soc_dai_link *dai_link;
-       int num_links;
-
-       for (num_links = 0, dai_link = card->dai_link;
-            num_links < card->num_links;
-            num_links++, dai_link++) {
-               of_node_put(dai_link->cpu_of_node);
-               of_node_put(dai_link->codec_of_node);
-       }
-       return 0;
-}
-
 static int rsrc_card_probe(struct platform_device *pdev)
 {
        struct rsrc_card_priv *priv;
@@ -409,7 +358,7 @@ static int rsrc_card_probe(struct platform_device *pdev)
        if (ret >= 0)
                return ret;
 err:
-       rsrc_card_unref(&priv->snd_card);
+       asoc_simple_card_clean_reference(&priv->snd_card);
 
        return ret;
 }
@@ -418,7 +367,7 @@ static int rsrc_card_remove(struct platform_device *pdev)
 {
        struct snd_soc_card *card = platform_get_drvdata(pdev);
 
-       return rsrc_card_unref(card);
+       return asoc_simple_card_clean_reference(card);
 }
 
 static struct platform_driver rsrc_card = {