vserver 1.9.5.x5

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

diff --git a/sound/core/seq/instr/ainstr_gf1.c b/sound/core/seq/instr/ainstr_gf1.c
index 13b46be..0779c41 100644 (file)
--- a/sound/core/seq/instr/ainstr_gf1.c
+++ b/sound/core/seq/instr/ainstr_gf1.c
@@ -30,10 +30,6 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
 MODULE_DESCRIPTION("Advanced Linux Sound Architecture GF1 (GUS) Patch support.");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_SUPPORTED_DEVICE("sound");
-
-char *snd_seq_gf1_id = SNDRV_SEQ_INSTR_ID_GUS_PATCH;
 
 static unsigned int snd_seq_gf1_size(unsigned int size, unsigned int format)
 {
@@ -64,7 +60,7 @@ static int snd_seq_gf1_copy_wave_from_stream(snd_gf1_ops_t *ops,
                return -EFAULT;
        *data += sizeof(xp);
        *len -= sizeof(xp);
-       wp = (gf1_wave_t *)snd_kcalloc(sizeof(*wp), gfp_mask);
+       wp = kcalloc(1, sizeof(*wp), gfp_mask);
        if (wp == NULL)
                return -ENOMEM;
        wp->share_id[0] = le32_to_cpu(xp.share_id[0]);
@@ -333,7 +329,7 @@ int snd_seq_gf1_init(snd_gf1_ops_t *ops,
        ops->private_data = private_data;
        ops->kops.private_data = ops;
        ops->kops.add_len = sizeof(gf1_instrument_t);
-       ops->kops.instr_type = snd_seq_gf1_id;
+       ops->kops.instr_type = SNDRV_SEQ_INSTR_ID_GUS_PATCH;
        ops->kops.put = snd_seq_gf1_put;
        ops->kops.get = snd_seq_gf1_get;
        ops->kops.get_size = snd_seq_gf1_get_size;
@@ -359,5 +355,4 @@ static void __exit alsa_ainstr_gf1_exit(void)
 module_init(alsa_ainstr_gf1_init)
 module_exit(alsa_ainstr_gf1_exit)
 
-EXPORT_SYMBOL(snd_seq_gf1_id);
 EXPORT_SYMBOL(snd_seq_gf1_init);