linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / sound / synth / emux / emux_proc.c

diff --git a/sound/synth/emux/emux_proc.c b/sound/synth/emux/emux_proc.c
index b67bb39..a70a179 100644 (file)
--- a/sound/synth/emux/emux_proc.c
+++ b/sound/synth/emux/emux_proc.c
@@ -30,13 +30,13 @@
 #ifdef CONFIG_PROC_FS
 
 static void
-snd_emux_proc_info_read(snd_info_entry_t *entry, 
-                       snd_info_buffer_t *buf)
+snd_emux_proc_info_read(struct snd_info_entry *entry, 
+                       struct snd_info_buffer *buf)
 {
-       snd_emux_t *emu;
+       struct snd_emux *emu;
        int i;
 
-       emu = snd_magic_cast(snd_emux_t, entry->private_data, return);
+       emu = entry->private_data;
        down(&emu->register_mutex);
        if (emu->name)
                snd_iprintf(buf, "Device: %s\n", emu->name);
@@ -66,7 +66,7 @@ snd_emux_proc_info_read(snd_info_entry_t *entry,
        }
 #if 0  /* debug */
        if (emu->voices[0].state != SNDRV_EMUX_ST_OFF && emu->voices[0].ch >= 0) {
-               snd_emux_voice_t *vp = &emu->voices[0];
+               struct snd_emux_voice *vp = &emu->voices[0];
                snd_iprintf(buf, "voice 0: on\n");
                snd_iprintf(buf, "mod delay=%x, atkhld=%x, dcysus=%x, rel=%x\n",
                            vp->reg.parm.moddelay,
@@ -107,9 +107,9 @@ snd_emux_proc_info_read(snd_info_entry_t *entry,
 }
 
 
-void snd_emux_proc_init(snd_emux_t *emu, snd_card_t *card, int device)
+void snd_emux_proc_init(struct snd_emux *emu, struct snd_card *card, int device)
 {
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
        char name[64];
 
        sprintf(name, "wavetableD%d", device);
@@ -127,7 +127,7 @@ void snd_emux_proc_init(snd_emux_t *emu, snd_card_t *card, int device)
                emu->proc = entry;
 }
 
-void snd_emux_proc_free(snd_emux_t *emu)
+void snd_emux_proc_free(struct snd_emux *emu)
 {
        if (emu->proc) {
                snd_info_unregister(emu->proc);