diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-08-10 19:33:09 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-11 11:00:26 (GMT) |
commit | c77f872e663e3f6ea18f774bf4399884884b4b22 (patch) | |
tree | f8a1cda807d8cfa942dc13517c04f3742b499aa7 | |
parent | 34d2f1b6feac3bc7e6022d30d624e9f3687717d3 (diff) | |
download | linux-fsl-qoriq-c77f872e663e3f6ea18f774bf4399884884b4b22.tar.xz |
ASoC: Remove unused snd_soc_info_volsw_ext()
The SOC_SINGLE_EXT control has been using snd_soc_info_volsw() for its info
callback since commit 1c433fb ("[ALSA] soc - 0.13 ASoC headers"). The
snd_soc_info_volsw_ext() function has been unused ever since then, so remove it.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | include/sound/soc.h | 2 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 26 |
2 files changed, 0 insertions, 28 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h index 6eabee7..724a42a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -497,8 +497,6 @@ int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); -int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo); #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c7d16df..6ba5f7c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2578,32 +2578,6 @@ int snd_soc_info_enum_ext(struct snd_kcontrol *kcontrol, EXPORT_SYMBOL_GPL(snd_soc_info_enum_ext); /** - * snd_soc_info_volsw_ext - external single mixer info callback - * @kcontrol: mixer control - * @uinfo: control element information - * - * Callback to provide information about a single external mixer control. - * - * Returns 0 for success. - */ -int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, - struct snd_ctl_elem_info *uinfo) -{ - int max = kcontrol->private_value; - - if (max == 1 && !strstr(kcontrol->id.name, " Volume")) - uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; - else - uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; - - uinfo->count = 1; - uinfo->value.integer.min = 0; - uinfo->value.integer.max = max; - return 0; -} -EXPORT_SYMBOL_GPL(snd_soc_info_volsw_ext); - -/** * snd_soc_info_volsw - single mixer info callback * @kcontrol: mixer control * @uinfo: control element information |