summaryrefslogtreecommitdiff
path: root/sound/usb/mixer.h
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2010-06-16 19:57:31 +0400
committerTakashi Iwai <tiwai@suse.de>2010-06-23 18:10:23 +0400
commit3d8d4dcfd423b01ef7ea7c3c97720764b7adb6df (patch)
tree4bb52394ecfe1f2bda274ab6af3dbe1be9d7bbf2 /sound/usb/mixer.h
parent157a57b6fae7d3c6d24b7623dcc6679c6d244621 (diff)
downloadlinux-3d8d4dcfd423b01ef7ea7c3c97720764b7adb6df.tar.xz
ALSA: usb-audio: simplify control interface access
As the control interface is now carried in struct snd_usb_audio, we can simplify the API a little and also drop the private ctrlif field from struct usb_mixer_interface. Also remove a left-over function prototype in pcm.h. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.h')
-rw-r--r--sound/usb/mixer.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h
index a7cf1007fbb0..26c636c5c93a 100644
--- a/sound/usb/mixer.h
+++ b/sound/usb/mixer.h
@@ -3,7 +3,6 @@
struct usb_mixer_interface {
struct snd_usb_audio *chip;
- unsigned int ctrlif;
struct list_head list;
unsigned int ignore_ctl_error;
struct urb *urb;