Merge branch 'master' into ysato-h8300

[uclinux-h8/linux.git] / include / sound / seq_kernel.h

diff --git a/include/sound/seq_kernel.h b/include/sound/seq_kernel.h
index eea5400..feb58d4 100644 (file)
--- a/include/sound/seq_kernel.h
+++ b/include/sound/seq_kernel.h
@@ -27,11 +27,8 @@
 typedef struct snd_seq_real_time snd_seq_real_time_t;
 typedef union snd_seq_timestamp snd_seq_timestamp_t;
 
-/* maximum number of events dequeued per schedule interval */
-#define SNDRV_SEQ_MAX_DEQUEUE          50
-
 /* maximum number of queues */
-#define SNDRV_SEQ_MAX_QUEUES           8
+#define SNDRV_SEQ_MAX_QUEUES           32
 
 /* max number of concurrent clients */
 #define SNDRV_SEQ_MAX_CLIENTS          192
@@ -42,9 +39,6 @@ typedef union snd_seq_timestamp snd_seq_timestamp_t;
 /* max number of events in memory pool */
 #define SNDRV_SEQ_MAX_EVENTS           2000
 
-/* default number of events in memory chunk */
-#define SNDRV_SEQ_DEFAULT_CHUNK_EVENTS 64
-
 /* default number of events in memory pool */
 #define SNDRV_SEQ_DEFAULT_EVENTS       500
 
@@ -70,7 +64,6 @@ struct snd_seq_port_callback {
        int (*unuse)(void *private_data, struct snd_seq_port_subscribe *info);
        int (*event_input)(struct snd_seq_event *ev, int direct, void *private_data, int atomic, int hop);
        void (*private_free)(void *private_data);
-       unsigned int callback_all;      /* call subscribe callbacks at each connection/disconnection */
        /*...*/
 };
 
@@ -106,13 +99,9 @@ int snd_seq_event_port_attach(int client, struct snd_seq_port_callback *pcbp,
 int snd_seq_event_port_detach(int client, int port);
 
 #ifdef CONFIG_MODULES
-void snd_seq_autoload_lock(void);
-void snd_seq_autoload_unlock(void);
 void snd_seq_autoload_init(void);
-#define snd_seq_autoload_exit()        snd_seq_autoload_lock()
+void snd_seq_autoload_exit(void);
 #else
-#define snd_seq_autoload_lock()
-#define snd_seq_autoload_unlock()
 #define snd_seq_autoload_init()
 #define snd_seq_autoload_exit()
 #endif