Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[powerpc.git] / sound / core / seq / seq_info.c

diff --git a/sound/core/seq/seq_info.c b/sound/core/seq/seq_info.c
index 3257cf4..8a7fe5c 100644 (file)
--- a/sound/core/seq/seq_info.c
+++ b/sound/core/seq/seq_info.c
@@ -27,15 +27,15 @@
 #include "seq_clientmgr.h"
 #include "seq_timer.h"
 
-
+#ifdef CONFIG_PROC_FS
 static struct snd_info_entry *queues_entry;
 static struct snd_info_entry *clients_entry;
 static struct snd_info_entry *timer_entry;
 
 
 static struct snd_info_entry * __init
-create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
-                                                    struct snd_info_buffer *))
+create_info_entry(char *name, void (*read)(struct snd_info_entry *,
+                                          struct snd_info_buffer *))
 {
        struct snd_info_entry *entry;
 
@@ -43,7 +43,6 @@ create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
        if (entry == NULL)
                return NULL;
        entry->content = SNDRV_INFO_CONTENT_TEXT;
-       entry->c.text.read_size = size;
        entry->c.text.read = read;
        if (snd_info_register(entry) < 0) {
                snd_info_free_entry(entry);
@@ -52,25 +51,22 @@ create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
        return entry;
 }
 
-
 /* create all our /proc entries */
 int __init snd_seq_info_init(void)
 {
-       queues_entry = create_info_entry("queues", 512 + (256 * SNDRV_SEQ_MAX_QUEUES),
+       queues_entry = create_info_entry("queues",
                                         snd_seq_info_queues_read);
-       clients_entry = create_info_entry("clients", 512 + (256 * SNDRV_SEQ_MAX_CLIENTS),
+       clients_entry = create_info_entry("clients",
                                          snd_seq_info_clients_read);
-       timer_entry = create_info_entry("timer", 1024, snd_seq_info_timer_read);
+       timer_entry = create_info_entry("timer", snd_seq_info_timer_read);
        return 0;
 }
 
 int __exit snd_seq_info_done(void)
 {
-       if (queues_entry)
-               snd_info_unregister(queues_entry);
-       if (clients_entry)
-               snd_info_unregister(clients_entry);
-       if (timer_entry)
-               snd_info_unregister(timer_entry);
+       snd_info_free_entry(queues_entry);
+       snd_info_free_entry(clients_entry);
+       snd_info_free_entry(timer_entry);
        return 0;
 }
+#endif