aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1/irq.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:50:13 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:47 -0500
commiteb4698f347ec908c365504c4edddadd1acd406ea (patch)
tree4962019c8bf4a52e35ab55137e17aa150edf9661 /sound/pci/emu10k1/irq.c
parent3d19f804ef5f1d15fe001fc8d1ed58fac9d591fb (diff)
[ALSA] Remove xxx_t typedefs: PCI emu10k1
Modules: EMU10K1/EMU10K2 driver Remove xxx_t typedefs from the PCI emu10k1 driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1/irq.c')
-rw-r--r--sound/pci/emu10k1/irq.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index 594ea063b140..a8b31286b6db 100644
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -32,7 +32,7 @@
32 32
33irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs) 33irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
34{ 34{
35 emu10k1_t *emu = dev_id; 35 struct snd_emu10k1 *emu = dev_id;
36 unsigned int status, status2, orig_status, orig_status2; 36 unsigned int status, status2, orig_status, orig_status2;
37 int handled = 0; 37 int handled = 0;
38 38
@@ -56,7 +56,7 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
56 int voice; 56 int voice;
57 int voice_max = status & IPR_CHANNELNUMBERMASK; 57 int voice_max = status & IPR_CHANNELNUMBERMASK;
58 u32 val; 58 u32 val;
59 emu10k1_voice_t *pvoice = emu->voices; 59 struct snd_emu10k1_voice *pvoice = emu->voices;
60 60
61 val = snd_emu10k1_ptr_read(emu, CLIPL, 0); 61 val = snd_emu10k1_ptr_read(emu, CLIPL, 0);
62 for (voice = 0; voice <= voice_max; voice++) { 62 for (voice = 0; voice <= voice_max; voice++) {
@@ -150,8 +150,8 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
150 if (status & IPR_P16V) { 150 if (status & IPR_P16V) {
151 while ((status2 = inl(emu->port + IPR2)) != 0) { 151 while ((status2 = inl(emu->port + IPR2)) != 0) {
152 u32 mask = INTE2_PLAYBACK_CH_0_LOOP; /* Full Loop */ 152 u32 mask = INTE2_PLAYBACK_CH_0_LOOP; /* Full Loop */
153 emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]); 153 struct snd_emu10k1_voice *pvoice = &(emu->p16v_voices[0]);
154 emu10k1_voice_t *cvoice = &(emu->p16v_capture_voice); 154 struct snd_emu10k1_voice *cvoice = &(emu->p16v_capture_voice);
155 155
156 //printk(KERN_INFO "status2=0x%x\n", status2); 156 //printk(KERN_INFO "status2=0x%x\n", status2);
157 orig_status2 = status2; 157 orig_status2 = status2;