diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 2 | ||||
-rw-r--r-- | include/sound/soc.h | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 075244ef41eb..0accdba211f9 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -188,7 +188,7 @@ | |||
188 | .private_value = (unsigned long)&xenum } | 188 | .private_value = (unsigned long)&xenum } |
189 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ | 189 | #define SOC_DAPM_VALUE_ENUM(xname, xenum) \ |
190 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 190 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
191 | .info = snd_soc_info_value_enum_double, \ | 191 | .info = snd_soc_info_enum_double, \ |
192 | .get = snd_soc_dapm_get_value_enum_double, \ | 192 | .get = snd_soc_dapm_get_value_enum_double, \ |
193 | .put = snd_soc_dapm_put_value_enum_double, \ | 193 | .put = snd_soc_dapm_put_value_enum_double, \ |
194 | .private_value = (unsigned long)&xenum } | 194 | .private_value = (unsigned long)&xenum } |
diff --git a/include/sound/soc.h b/include/sound/soc.h index 9d5a0362a055..7039343e8a78 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -106,7 +106,7 @@ | |||
106 | .private_value = (unsigned long)&xenum } | 106 | .private_value = (unsigned long)&xenum } |
107 | #define SOC_VALUE_ENUM(xname, xenum) \ | 107 | #define SOC_VALUE_ENUM(xname, xenum) \ |
108 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\ | 108 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,\ |
109 | .info = snd_soc_info_value_enum_double, \ | 109 | .info = snd_soc_info_enum_double, \ |
110 | .get = snd_soc_get_value_enum_double, \ | 110 | .get = snd_soc_get_value_enum_double, \ |
111 | .put = snd_soc_put_value_enum_double, \ | 111 | .put = snd_soc_put_value_enum_double, \ |
112 | .private_value = (unsigned long)&xenum } | 112 | .private_value = (unsigned long)&xenum } |
@@ -224,8 +224,6 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol, | |||
224 | struct snd_ctl_elem_value *ucontrol); | 224 | struct snd_ctl_elem_value *ucontrol); |
225 | int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, | 225 | int snd_soc_put_enum_double(struct snd_kcontrol *kcontrol, |
226 | struct snd_ctl_elem_value *ucontrol); | 226 | struct snd_ctl_elem_value *ucontrol); |
227 | int snd_soc_info_value_enum_double(struct snd_kcontrol *kcontrol, | ||
228 | struct snd_ctl_elem_info *uinfo); | ||
229 | int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol, | 227 | int snd_soc_get_value_enum_double(struct snd_kcontrol *kcontrol, |
230 | struct snd_ctl_elem_value *ucontrol); | 228 | struct snd_ctl_elem_value *ucontrol); |
231 | int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, | 229 | int snd_soc_put_value_enum_double(struct snd_kcontrol *kcontrol, |
@@ -453,17 +451,6 @@ struct soc_enum { | |||
453 | unsigned char shift_l; | 451 | unsigned char shift_l; |
454 | unsigned char shift_r; | 452 | unsigned char shift_r; |
455 | unsigned int max; | 453 | unsigned int max; |
456 | const char **texts; | ||
457 | void *dapm; | ||
458 | }; | ||
459 | |||
460 | /* semi enumerated kcontrol */ | ||
461 | struct soc_value_enum { | ||
462 | unsigned short reg; | ||
463 | unsigned short reg2; | ||
464 | unsigned char shift_l; | ||
465 | unsigned char shift_r; | ||
466 | unsigned int max; | ||
467 | unsigned int mask; | 454 | unsigned int mask; |
468 | const char **texts; | 455 | const char **texts; |
469 | const unsigned int *values; | 456 | const unsigned int *values; |