diff options
author | Felix Homann <linuxaudio@showlabor.de> | 2012-04-23 14:24:24 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-04-24 02:01:27 -0400 |
commit | 285de9c08b07af8f2c1ab263705952672b3cf46c (patch) | |
tree | d622acfecec3e42daa16c6e187ffbd9936629434 /sound/usb | |
parent | 8a4d1d397b37f5aab1f830c0c7ca1fcdebf7ad9e (diff) |
ALSA: usb-audio: Rename and export mixer_vol_tlv
Rename mixer_vol_tlv to snd_usb_mixer_vol_tlv and export it to make
it reuseable in mixer_quirks.c.
Signed-off-by: Felix Homann <linuxaudio@showlabor.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/mixer.c | 4 | ||||
-rw-r--r-- | sound/usb/mixer.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c374c7242ab2..bb56f5353fe0 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
@@ -486,7 +486,7 @@ static int set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel, | |||
486 | /* | 486 | /* |
487 | * TLV callback for mixer volume controls | 487 | * TLV callback for mixer volume controls |
488 | */ | 488 | */ |
489 | static int mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, | 489 | int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, |
490 | unsigned int size, unsigned int __user *_tlv) | 490 | unsigned int size, unsigned int __user *_tlv) |
491 | { | 491 | { |
492 | struct usb_mixer_elem_info *cval = kcontrol->private_data; | 492 | struct usb_mixer_elem_info *cval = kcontrol->private_data; |
@@ -1158,7 +1158,7 @@ static void build_feature_ctl(struct mixer_build *state, void *raw_desc, | |||
1158 | if (control == UAC_FU_VOLUME) { | 1158 | if (control == UAC_FU_VOLUME) { |
1159 | check_mapped_dB(map, cval); | 1159 | check_mapped_dB(map, cval); |
1160 | if (cval->dBmin < cval->dBmax || !cval->initialized) { | 1160 | if (cval->dBmin < cval->dBmax || !cval->initialized) { |
1161 | kctl->tlv.c = mixer_vol_tlv; | 1161 | kctl->tlv.c = snd_usb_mixer_vol_tlv; |
1162 | kctl->vd[0].access |= | 1162 | kctl->vd[0].access |= |
1163 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | | 1163 | SNDRV_CTL_ELEM_ACCESS_TLV_READ | |
1164 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK; | 1164 | SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK; |
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 81b2d8a32fb0..a7f3d45a8acf 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h | |||
@@ -68,4 +68,7 @@ int snd_usb_mixer_activate(struct usb_mixer_interface *mixer); | |||
68 | int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer, | 68 | int snd_usb_mixer_add_control(struct usb_mixer_interface *mixer, |
69 | struct snd_kcontrol *kctl); | 69 | struct snd_kcontrol *kctl); |
70 | 70 | ||
71 | int snd_usb_mixer_vol_tlv(struct snd_kcontrol *kcontrol, int op_flag, | ||
72 | unsigned int size, unsigned int __user *_tlv); | ||
73 | |||
71 | #endif /* __USBMIXER_H */ | 74 | #endif /* __USBMIXER_H */ |