Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / sound / seq_oss.h

diff --git a/include/sound/seq_oss.h b/include/sound/seq_oss.h
index bd7e573..9b060bb 100644 (file)
--- a/include/sound/seq_oss.h
+++ b/include/sound/seq_oss.h
@@ -24,23 +24,17 @@
 #include "asequencer.h"
 #include "seq_kernel.h"
 
-/*
- * type definitions
- */
-typedef struct snd_seq_oss_arg_t snd_seq_oss_arg_t;
-typedef struct snd_seq_oss_callback_t snd_seq_oss_callback_t;
-
 /*
  * argument structure for synthesizer operations
  */
-struct snd_seq_oss_arg_t {
+struct snd_seq_oss_arg {
        /* given by OSS sequencer */
        int app_index;  /* application unique index */
        int file_mode;  /* file mode - see below */
        int seq_mode;   /* sequencer mode - see below */
 
        /* following must be initialized in open callback */
-       snd_seq_addr_t addr;    /* opened port address */
+       struct snd_seq_addr addr;       /* opened port address */
        void *private_data;     /* private data for lowlevel drivers */
 
        /* note-on event passing mode: initially given by OSS seq,
@@ -53,14 +47,14 @@ struct snd_seq_oss_arg_t {
 /*
  * synthesizer operation callbacks
  */
-struct snd_seq_oss_callback_t {
+struct snd_seq_oss_callback {
        struct module *owner;
-       int (*open)(snd_seq_oss_arg_t *p, void *closure);
-       int (*close)(snd_seq_oss_arg_t *p);
-       int (*ioctl)(snd_seq_oss_arg_t *p, unsigned int cmd, unsigned long arg);
-       int (*load_patch)(snd_seq_oss_arg_t *p, int format, const char __user *buf, int offs, int count);
-       int (*reset)(snd_seq_oss_arg_t *p);
-       int (*raw_event)(snd_seq_oss_arg_t *p, unsigned char *data);
+       int (*open)(struct snd_seq_oss_arg *p, void *closure);
+       int (*close)(struct snd_seq_oss_arg *p);
+       int (*ioctl)(struct snd_seq_oss_arg *p, unsigned int cmd, unsigned long arg);
+       int (*load_patch)(struct snd_seq_oss_arg *p, int format, const char __user *buf, int offs, int count);
+       int (*reset)(struct snd_seq_oss_arg *p);
+       int (*raw_event)(struct snd_seq_oss_arg *p, unsigned char *data);
 };
 
 /* flag: file_mode */
@@ -88,13 +82,13 @@ struct snd_seq_oss_callback_t {
 /*
  * data pointer to snd_seq_register_device
  */
-typedef struct snd_seq_oss_reg {
+struct snd_seq_oss_reg {
        int type;
        int subtype;
        int nvoices;
-       snd_seq_oss_callback_t oper;
+       struct snd_seq_oss_callback oper;
        void *private_data;
-} snd_seq_oss_reg_t;
+};
 
 /* device id */
 #define SNDRV_SEQ_DEV_ID_OSS           "seq-oss"