diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2013-06-14 13:16:54 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2013-06-14 12:34:11 +0100 |
| commit | 656ca9d327a3dbac6db28c5bf80f5bc86f7f8548 (patch) | |
| tree | d17bea6ae6797b6f8dd48fca4ce7ea50ff6a0f3f /sound/soc/soc-dapm.c | |
| parent | ASoC: dapm: Add a helper function to free a DAPM path (diff) | |
| download | linux-dev-656ca9d327a3dbac6db28c5bf80f5bc86f7f8548.tar.xz linux-dev-656ca9d327a3dbac6db28c5bf80f5bc86f7f8548.zip | |
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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 784534dcc82d..163f26d9571c 100644 --- 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); } |