summaryrefslogtreecommitdiffstats
path: root/sound/usb/usx2y/usbusx2y.h
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-11-16 12:26:30 +0100
committerTakashi Iwai <tiwai@suse.de>2009-11-24 10:20:09 +0100
commita014bbadb53121e243cac254593e79e3ca89742d (patch)
tree1bfd7f4106b9041839ff7944dfcf12d79f1397fd /sound/usb/usx2y/usbusx2y.h
parentsound: usb: make the USB MIDI module more independent (diff)
downloadlinux-a014bbadb53121e243cac254593e79e3ca89742d.tar.xz
linux-a014bbadb53121e243cac254593e79e3ca89742d.zip
sound: usxxx: cleanup chip field
The chip field is no longer needed. Move those of its fields that are actually used to the device structure itself. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usx2y/usbusx2y.h')
-rw-r--r--sound/usb/usx2y/usbusx2y.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h
index 231866ea3491..1d174cea352b 100644
--- a/sound/usb/usx2y/usbusx2y.h
+++ b/sound/usb/usx2y/usbusx2y.h
@@ -22,7 +22,8 @@ struct snd_usX2Y_urbSeq {
#include "usx2yhwdeppcm.h"
struct usX2Ydev {
- struct snd_usb_audio chip;
+ struct usb_device *dev;
+ int card_index;
int stride;
struct urb *In04urb;
void *In04Buf;
@@ -43,6 +44,8 @@ struct usX2Ydev {
struct snd_usX2Y_substream * volatile prepare_subs;
wait_queue_head_t prepare_wait_queue;
struct list_head midi_list;
+ struct list_head pcm_list;
+ int pcm_devs;
};