diff options
-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 6eabee7ec15a..724a42af40fa 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, | |||
497 | struct snd_ctl_elem_value *ucontrol); | 497 | struct snd_ctl_elem_value *ucontrol); |
498 | int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, | 498 | int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, |
499 | struct snd_ctl_elem_info *uinfo); | 499 | struct snd_ctl_elem_info *uinfo); |
500 | int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, | ||
501 | struct snd_ctl_elem_info *uinfo); | ||
502 | #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info | 500 | #define snd_soc_info_bool_ext snd_ctl_boolean_mono_info |
503 | int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, | 501 | int snd_soc_get_volsw(struct snd_kcontrol *kcontrol, |
504 | struct snd_ctl_elem_value *ucontrol); | 502 | struct snd_ctl_elem_value *ucontrol); |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c7d16df9efd9..6ba5f7c23d3a 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, | |||
2578 | EXPORT_SYMBOL_GPL(snd_soc_info_enum_ext); | 2578 | EXPORT_SYMBOL_GPL(snd_soc_info_enum_ext); |
2579 | 2579 | ||
2580 | /** | 2580 | /** |
2581 | * snd_soc_info_volsw_ext - external single mixer info callback | ||
2582 | * @kcontrol: mixer control | ||
2583 | * @uinfo: control element information | ||
2584 | * | ||
2585 | * Callback to provide information about a single external mixer control. | ||
2586 | * | ||
2587 | * Returns 0 for success. | ||
2588 | */ | ||
2589 | int snd_soc_info_volsw_ext(struct snd_kcontrol *kcontrol, | ||
2590 | struct snd_ctl_elem_info *uinfo) | ||
2591 | { | ||
2592 | int max = kcontrol->private_value; | ||
2593 | |||
2594 | if (max == 1 && !strstr(kcontrol->id.name, " Volume")) | ||
2595 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | ||
2596 | else | ||
2597 | uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; | ||
2598 | |||
2599 | uinfo->count = 1; | ||
2600 | uinfo->value.integer.min = 0; | ||
2601 | uinfo->value.integer.max = max; | ||
2602 | return 0; | ||
2603 | } | ||
2604 | EXPORT_SYMBOL_GPL(snd_soc_info_volsw_ext); | ||
2605 | |||
2606 | /** | ||
2607 | * snd_soc_info_volsw - single mixer info callback | 2581 | * snd_soc_info_volsw - single mixer info callback |
2608 | * @kcontrol: mixer control | 2582 | * @kcontrol: mixer control |
2609 | * @uinfo: control element information | 2583 | * @uinfo: control element information |