fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / isa / gus / gus_irq.c

diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c
index 4aeabe8..537d3cf 100644 (file)
--- a/sound/isa/gus/gus_irq.c
+++ b/sound/isa/gus/gus_irq.c
@@ -30,9 +30,9 @@
 #define STAT_ADD(x)    while (0) { ; }
 #endif
 
-irqreturn_t snd_gus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t snd_gus_interrupt(int irq, void *dev_id)
 {
-       snd_gus_card_t * gus = snd_magic_cast(snd_gus_card_t, dev_id, return IRQ_NONE);
+       struct snd_gus_card * gus = dev_id;
        unsigned char status;
        int loop = 100;
        int handled = 0;
@@ -54,7 +54,7 @@ __again:
        if (status & (0x20 | 0x40)) {
                unsigned int already, _current_;
                unsigned char voice_status, voice;
-               snd_gus_voice_t *pvoice;
+               struct snd_gus_voice *pvoice;
 
                already = 0;
                while (((voice_status = snd_gf1_i_read8(gus, SNDRV_GF1_GB_VOICES_IRQ)) & 0xc0) != 0xc0) {
@@ -107,14 +107,14 @@ __again:
 }
 
 #ifdef CONFIG_SND_DEBUG
-static void snd_gus_irq_info_read(snd_info_entry_t *entry, 
-                                 snd_info_buffer_t * buffer)
+static void snd_gus_irq_info_read(struct snd_info_entry *entry, 
+                                 struct snd_info_buffer *buffer)
 {
-       snd_gus_card_t *gus;
-       snd_gus_voice_t *pvoice;
+       struct snd_gus_card *gus;
+       struct snd_gus_voice *pvoice;
        int idx;
 
-       gus = snd_magic_cast(snd_gus_card_t, entry->private_data, return);
+       gus = entry->private_data;
        snd_iprintf(buffer, "midi out = %u\n", gus->gf1.interrupt_stat_midi_out);
        snd_iprintf(buffer, "midi in = %u\n", gus->gf1.interrupt_stat_midi_in);
        snd_iprintf(buffer, "timer1 = %u\n", gus->gf1.interrupt_stat_timer1);
@@ -131,12 +131,12 @@ static void snd_gus_irq_info_read(snd_info_entry_t *entry,
        }
 }
 
-void snd_gus_irq_profile_init(snd_gus_card_t *gus)
+void snd_gus_irq_profile_init(struct snd_gus_card *gus)
 {
-       snd_info_entry_t *entry;
+       struct snd_info_entry *entry;
 
        if (! snd_card_proc_new(gus->card, "gusirq", &entry))
-               snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read);
+               snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);
 }
 
 #endif