ASoC: dapm: Remove unused long_name field from snd_soc_dapm_path struct

Since commit 85762e71 ("ASoC: dapm: Implement mixer control sharing") the
long_name field of the snd_soc_dapm_path struct is unused. All of the name
handling now happens entirely in dapm_create_or_share_mixmux_kcontrol(). So we
can remove the long_name field from the snd_soc_dapm_path struct.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index d4609029f014e3dc9cd4592e6719bba470f4bb67..360da978395dadb32987c8c5021b961e6d87cfaf 100644 (file)
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -478,7 +478,6 @@ struct snd_soc_dapm_route {
 /* dapm audio path between two widgets */
 struct snd_soc_dapm_path {
        const char *name;
-       const char *long_name;
 
        /* source (input) and sink (output) widgets */
        struct snd_soc_dapm_widget *source;

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 784534dcc82d7b3c32a2fe81247c389721907ae8..163f26d9571cba4ccd7753da98b2929958982061 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -621,17 +621,15 @@ static int dapm_create_or_share_mixmux_kcontrol(struct snd_soc_dapm_widget *w,
                kcontrol = snd_soc_cnew(&w->kcontrol_news[kci], wlist, name,
                                        prefix);
                kcontrol->private_free = dapm_kcontrol_free;
+               kfree(long_name);
                ret = snd_ctl_add(card, kcontrol);
                if (ret < 0) {
                        dev_err(dapm->dev,
                                "ASoC: failed to add widget %s dapm kcontrol %s: %d\n",
                                w->name, name, ret);
                        kfree(wlist);
-                       kfree(long_name);
                        return ret;
                }
-
-               path->long_name = long_name;
        }
 
        kcontrol->private_data = wlist;
@@ -2110,7 +2108,6 @@ static void dapm_free_path(struct snd_soc_dapm_path *path)
        list_del(&path->list_sink);
        list_del(&path->list_source);
        list_del(&path->list);
-       kfree(path->long_name);
        kfree(path);
 }