ASoC: audio-graph-card2.c: remove pre-alloced Codec2Codec space

[sfrench/cifs-2.6.git] / sound / soc / generic / simple-card-utils.c

diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index 7be84c7840cbb91e72b97982766df6c025ea47fa..a761af6b13b62b37e9a3e109775e9ddb2ae55699 100644 (file)
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -746,8 +746,7 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
        struct asoc_simple_dai *dais;
        struct snd_soc_dai_link_component *dlcs;
        struct snd_soc_codec_conf *cconf = NULL;
        struct asoc_simple_dai *dais;
        struct snd_soc_dai_link_component *dlcs;
        struct snd_soc_codec_conf *cconf = NULL;

-       struct snd_soc_pcm_stream *c2c_conf = NULL;
-       int i, dai_num = 0, dlc_num = 0, cnf_num = 0, c2c_num = 0;
+       int i, dai_num = 0, dlc_num = 0, cnf_num = 0;

 
        dai_props = devm_kcalloc(dev, li->link, sizeof(*dai_props), GFP_KERNEL);
        dai_link  = devm_kcalloc(dev, li->link, sizeof(*dai_link),  GFP_KERNEL);
 
        dai_props = devm_kcalloc(dev, li->link, sizeof(*dai_props), GFP_KERNEL);
        dai_link  = devm_kcalloc(dev, li->link, sizeof(*dai_link),  GFP_KERNEL);


@@ -766,8 +765,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
 
                if (!li->num[i].cpus)
                        cnf_num += li->num[i].codecs;
 
                if (!li->num[i].cpus)
                        cnf_num += li->num[i].codecs;

-
-               c2c_num += li->num[i].c2c;

        }
 
        dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL);
        }
 
        dais = devm_kcalloc(dev, dai_num, sizeof(*dais), GFP_KERNEL);


@@ -781,12 +778,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
                        return -ENOMEM;
        }
 
                        return -ENOMEM;
        }
 

-       if (c2c_num) {
-               c2c_conf = devm_kcalloc(dev, c2c_num, sizeof(*c2c_conf), GFP_KERNEL);
-               if (!c2c_conf)
-                       return -ENOMEM;
-       }
-

        dev_dbg(dev, "link %d, dais %d, ccnf %d\n",
                li->link, dai_num, cnf_num);
 
        dev_dbg(dev, "link %d, dais %d, ccnf %d\n",
                li->link, dai_num, cnf_num);
 


@@ -800,7 +791,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
        priv->dais              = dais;
        priv->dlcs              = dlcs;
        priv->codec_conf        = cconf;
        priv->dais              = dais;
        priv->dlcs              = dlcs;
        priv->codec_conf        = cconf;

-       priv->c2c_conf          = c2c_conf;

 
        card->dai_link          = priv->dai_link;
        card->num_links         = li->link;
 
        card->dai_link          = priv->dai_link;
        card->num_links         = li->link;


@@ -818,12 +808,6 @@ int asoc_simple_init_priv(struct asoc_simple_priv *priv,
 
                        dlcs += li->num[i].cpus;
                        dais += li->num[i].cpus;
 
                        dlcs += li->num[i].cpus;
                        dais += li->num[i].cpus;

-
-                       if (li->num[i].c2c) {
-                               /* Codec2Codec */
-                               dai_props[i].c2c_conf = c2c_conf;
-                               c2c_conf += li->num[i].c2c;
-                       }

                } else {
                        /* DPCM Be's CPU = dummy */
                        dai_props[i].cpus       =
                } else {
                        /* DPCM Be's CPU = dummy */
                        dai_props[i].cpus       =