diff options
Diffstat (limited to 'sound/isa/gus/gus_irq.c')
-rw-r--r-- | sound/isa/gus/gus_irq.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/isa/gus/gus_irq.c b/sound/isa/gus/gus_irq.c index 1e2a15eb8106..c19ba2910b72 100644 --- a/sound/isa/gus/gus_irq.c +++ b/sound/isa/gus/gus_irq.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | irqreturn_t snd_gus_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 33 | irqreturn_t snd_gus_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
34 | { | 34 | { |
35 | snd_gus_card_t * gus = dev_id; | 35 | struct snd_gus_card * gus = dev_id; |
36 | unsigned char status; | 36 | unsigned char status; |
37 | int loop = 100; | 37 | int loop = 100; |
38 | int handled = 0; | 38 | int handled = 0; |
@@ -54,7 +54,7 @@ __again: | |||
54 | if (status & (0x20 | 0x40)) { | 54 | if (status & (0x20 | 0x40)) { |
55 | unsigned int already, _current_; | 55 | unsigned int already, _current_; |
56 | unsigned char voice_status, voice; | 56 | unsigned char voice_status, voice; |
57 | snd_gus_voice_t *pvoice; | 57 | struct snd_gus_voice *pvoice; |
58 | 58 | ||
59 | already = 0; | 59 | already = 0; |
60 | while (((voice_status = snd_gf1_i_read8(gus, SNDRV_GF1_GB_VOICES_IRQ)) & 0xc0) != 0xc0) { | 60 | while (((voice_status = snd_gf1_i_read8(gus, SNDRV_GF1_GB_VOICES_IRQ)) & 0xc0) != 0xc0) { |
@@ -107,11 +107,11 @@ __again: | |||
107 | } | 107 | } |
108 | 108 | ||
109 | #ifdef CONFIG_SND_DEBUG | 109 | #ifdef CONFIG_SND_DEBUG |
110 | static void snd_gus_irq_info_read(snd_info_entry_t *entry, | 110 | static void snd_gus_irq_info_read(struct snd_info_entry *entry, |
111 | snd_info_buffer_t * buffer) | 111 | struct snd_info_buffer *buffer) |
112 | { | 112 | { |
113 | snd_gus_card_t *gus; | 113 | struct snd_gus_card *gus; |
114 | snd_gus_voice_t *pvoice; | 114 | struct snd_gus_voice *pvoice; |
115 | int idx; | 115 | int idx; |
116 | 116 | ||
117 | gus = entry->private_data; | 117 | gus = entry->private_data; |
@@ -131,9 +131,9 @@ static void snd_gus_irq_info_read(snd_info_entry_t *entry, | |||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
134 | void snd_gus_irq_profile_init(snd_gus_card_t *gus) | 134 | void snd_gus_irq_profile_init(struct snd_gus_card *gus) |
135 | { | 135 | { |
136 | snd_info_entry_t *entry; | 136 | struct snd_info_entry *entry; |
137 | 137 | ||
138 | if (! snd_card_proc_new(gus->card, "gusirq", &entry)) | 138 | if (! snd_card_proc_new(gus->card, "gusirq", &entry)) |
139 | snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read); | 139 | snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read); |