vserver 1.9.3

[linux-2.6.git] / sound / core / seq / seq_midi.c

diff --git a/sound/core/seq/seq_midi.c b/sound/core/seq/seq_midi.c
index ebfb232..202bbea 100644 (file)
--- a/sound/core/seq/seq_midi.c
+++ b/sound/core/seq/seq_midi.c
@@ -31,6 +31,7 @@ Possible options for midisynth module:
 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/moduleparam.h>
 #include <asm/semaphore.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
@@ -42,13 +43,11 @@ Possible options for midisynth module:
 MODULE_AUTHOR("Frank van de Pol <fvdpol@coil.demon.nl>, Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture sequencer MIDI synth.");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_SUPPORTED_DEVICE("sound");
 int output_buffer_size = PAGE_SIZE;
-MODULE_PARM(output_buffer_size, "i");
+module_param(output_buffer_size, int, 0644);
 MODULE_PARM_DESC(output_buffer_size, "Output buffer size in bytes.");
 int input_buffer_size = PAGE_SIZE;
-MODULE_PARM(input_buffer_size, "i");
+module_param(input_buffer_size, int, 0644);
 MODULE_PARM_DESC(input_buffer_size, "Input buffer size in bytes.");
 
 /* data for this midi synth driver */
@@ -322,7 +321,7 @@ snd_seq_midisynth_register_port(snd_seq_device_t *dev)
        client = synths[card->number];
        if (client == NULL) {
                newclient = 1;
-               client = snd_kcalloc(sizeof(seq_midisynth_client_t), GFP_KERNEL);
+               client = kcalloc(1, sizeof(*client), GFP_KERNEL);
                if (client == NULL) {
                        up(&register_mutex);
                        return -ENOMEM;
@@ -340,7 +339,7 @@ snd_seq_midisynth_register_port(snd_seq_device_t *dev)
        } else if (device == 0)
                set_client_name(client, card, &info); /* use the first device's name */
 
-       msynth = snd_kcalloc(sizeof(seq_midisynth_t) * ports, GFP_KERNEL);
+       msynth = kcalloc(ports, sizeof(seq_midisynth_t), GFP_KERNEL);
        if (msynth == NULL)
                goto __nomem;