1 files changed, 22 insertions, 23 deletions
diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h
index f65f3a7194ca..435c1feda9df 100644
--- a/sound/usb/usx2y/usbusx2y.h
+++ b/sound/usb/usx2y/usbusx2y.h
@@ -8,47 +8,46 @@
 #define URBS_AsyncSeq 10
 #define URB_DataLen_AsyncSeq 32
-typedef struct {
+struct snd_usX2Y_AsyncSeq {
-        struct urb*     urb[URBS_AsyncSeq];
+        struct urb      *urb[URBS_AsyncSeq];
-        char*   buffer;
+        char            *buffer;
-} snd_usX2Y_AsyncSeq_t;
+};
-typedef struct {
+struct snd_usX2Y_urbSeq {
        int     submitted;
        int     len;
-        struct urb*     urb[0];
+        struct urb      *urb[0];
-} snd_usX2Y_urbSeq_t;
+};
-typedef struct snd_usX2Y_substream snd_usX2Y_substream_t;
 #include "usx2yhwdeppcm.h"
-typedef struct {
+struct usX2Ydev {
-        snd_usb_audio_t         chip;
+        struct snd_usb_audio    chip;
        int                     stride;
        struct urb              *In04urb;
        void                    *In04Buf;
        char                    In04Last[24];
        unsigned                In04IntCalls;
-        snd_usX2Y_urbSeq_t      *US04;
+        struct snd_usX2Y_urbSeq *US04;
        wait_queue_head_t       In04WaitQueue;
-        snd_usX2Y_AsyncSeq_t    AS04;
+        struct snd_usX2Y_AsyncSeq       AS04;
        unsigned int            rate,
                                format;
        int                     chip_status;
        struct semaphore        prepare_mutex;
-        us428ctls_sharedmem_t   *us428ctls_sharedmem;
+        struct us428ctls_sharedmem      *us428ctls_sharedmem;
        int                     wait_iso_frame;
        wait_queue_head_t       us428ctls_wait_queue_head;
-        snd_usX2Y_hwdep_pcm_shm_t       *hwdep_pcm_shm;
+        struct snd_usX2Y_hwdep_pcm_shm  *hwdep_pcm_shm;
-        snd_usX2Y_substream_t   *subs[4];
+        struct snd_usX2Y_substream      *subs[4];
-        snd_usX2Y_substream_t   * volatile  prepare_subs;
+        struct snd_usX2Y_substream      * volatile  prepare_subs;
        wait_queue_head_t       prepare_wait_queue;
-} usX2Ydev_t;
+};
 struct snd_usX2Y_substream {
-        usX2Ydev_t      *usX2Y;
+        struct usX2Ydev *usX2Y;
-        snd_pcm_substream_t *pcm_substream;
+        struct snd_pcm_substream *pcm_substream;
        int                     endpoint;               
        unsigned int            maxpacksize;            /* max packet size in bytes */
@@ -72,12 +71,12 @@ struct snd_usX2Y_substream {
 };
-#define usX2Y(c) ((usX2Ydev_t*)(c)->private_data)
+#define usX2Y(c) ((struct usX2Ydev *)(c)->private_data)
-int usX2Y_audio_create(snd_card_t* card);
+int usX2Y_audio_create(struct snd_card *card);
-int usX2Y_AsyncSeq04_init(usX2Ydev_t* usX2Y);
+int usX2Y_AsyncSeq04_init(struct usX2Ydev *usX2Y);
-int usX2Y_In04_init(usX2Ydev_t* usX2Y);
+int usX2Y_In04_init(struct usX2Ydev *usX2Y);
 #define NAME_ALLCAPS "US-X2Y"

diff --git a/sound/usb/usx2y/usbusx2y.h b/sound/usb/usx2y/usbusx2y.h index f65f3a7194ca..435c1feda9df 100644 --- a/sound/usb/usx2y/usbusx2y.h +++ b/sound/usb/usx2y/usbusx2y.h
@@ -8,47 +8,46 @@
8		8
9	#define URBS_AsyncSeq 10	9	#define URBS_AsyncSeq 10
10	#define URB_DataLen_AsyncSeq 32	10	#define URB_DataLen_AsyncSeq 32
11	typedef struct {	11	struct snd_usX2Y_AsyncSeq {
12	struct urb* urb[URBS_AsyncSeq];	12	struct urb *urb[URBS_AsyncSeq];
13	char* buffer;	13	char *buffer;
14	} snd_usX2Y_AsyncSeq_t;	14	};
15		15
16	typedef struct {	16	struct snd_usX2Y_urbSeq {
17	int submitted;	17	int submitted;
18	int len;	18	int len;
19	struct urb* urb[0];	19	struct urb *urb[0];
20	} snd_usX2Y_urbSeq_t;	20	};
21		21
22	typedef struct snd_usX2Y_substream snd_usX2Y_substream_t;
23	#include "usx2yhwdeppcm.h"	22	#include "usx2yhwdeppcm.h"
24		23
25	typedef struct {	24	struct usX2Ydev {
26	snd_usb_audio_t chip;	25	struct snd_usb_audio chip;
27	int stride;	26	int stride;
28	struct urb *In04urb;	27	struct urb *In04urb;
29	void *In04Buf;	28	void *In04Buf;
30	char In04Last[24];	29	char In04Last[24];
31	unsigned In04IntCalls;	30	unsigned In04IntCalls;
32	snd_usX2Y_urbSeq_t *US04;	31	struct snd_usX2Y_urbSeq *US04;
33	wait_queue_head_t In04WaitQueue;	32	wait_queue_head_t In04WaitQueue;
34	snd_usX2Y_AsyncSeq_t AS04;	33	struct snd_usX2Y_AsyncSeq AS04;
35	unsigned int rate,	34	unsigned int rate,
36	format;	35	format;
37	int chip_status;	36	int chip_status;
38	struct semaphore prepare_mutex;	37	struct semaphore prepare_mutex;
39	us428ctls_sharedmem_t *us428ctls_sharedmem;	38	struct us428ctls_sharedmem *us428ctls_sharedmem;
40	int wait_iso_frame;	39	int wait_iso_frame;
41	wait_queue_head_t us428ctls_wait_queue_head;	40	wait_queue_head_t us428ctls_wait_queue_head;
42	snd_usX2Y_hwdep_pcm_shm_t *hwdep_pcm_shm;	41	struct snd_usX2Y_hwdep_pcm_shm *hwdep_pcm_shm;
43	snd_usX2Y_substream_t *subs[4];	42	struct snd_usX2Y_substream *subs[4];
44	snd_usX2Y_substream_t * volatile prepare_subs;	43	struct snd_usX2Y_substream * volatile prepare_subs;
45	wait_queue_head_t prepare_wait_queue;	44	wait_queue_head_t prepare_wait_queue;
46	} usX2Ydev_t;	45	};
47		46
48		47
49	struct snd_usX2Y_substream {	48	struct snd_usX2Y_substream {
50	usX2Ydev_t *usX2Y;	49	struct usX2Ydev *usX2Y;
51	snd_pcm_substream_t *pcm_substream;	50	struct snd_pcm_substream *pcm_substream;
52		51
53	int endpoint;	52	int endpoint;
54	unsigned int maxpacksize; /* max packet size in bytes */	53	unsigned int maxpacksize; /* max packet size in bytes */
@@ -72,12 +71,12 @@ struct snd_usX2Y_substream {
72	};	71	};
73		72
74		73
75	#define usX2Y(c) ((usX2Ydev_t*)(c)->private_data)	74	#define usX2Y(c) ((struct usX2Ydev *)(c)->private_data)
76		75
77	int usX2Y_audio_create(snd_card_t* card);	76	int usX2Y_audio_create(struct snd_card *card);
78		77
79	int usX2Y_AsyncSeq04_init(usX2Ydev_t* usX2Y);	78	int usX2Y_AsyncSeq04_init(struct usX2Ydev *usX2Y);
80	int usX2Y_In04_init(usX2Ydev_t* usX2Y);	79	int usX2Y_In04_init(struct usX2Ydev *usX2Y);
81		80
82	#define NAME_ALLCAPS "US-X2Y"	81	#define NAME_ALLCAPS "US-X2Y"
83		82