aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/gus
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-07-01 22:29:46 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-02 16:58:54 -0400
commit65ca68b30073473583f6ca2f463cbd94ade43ddb (patch)
treef7d4384450fbdfcb2661a74f3c2f28e53721eeb0 /sound/isa/gus
parent63a43399db67d6f94364f933f68f38f58387737a (diff)
[PATCH] irq-flags: sound: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Jaroslav Kysela <perex@suse.cz> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/isa/gus')
-rw-r--r--sound/isa/gus/gus_main.c2
-rw-r--r--sound/isa/gus/gusextreme.c2
-rw-r--r--sound/isa/gus/gusmax.c2
-rw-r--r--sound/isa/gus/interwave.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 53eeaf37007d..b680fddf0d74 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -179,7 +179,7 @@ int snd_gus_create(struct snd_card *card,
179 snd_gus_free(gus); 179 snd_gus_free(gus);
180 return -EBUSY; 180 return -EBUSY;
181 } 181 }
182 if (irq >= 0 && request_irq(irq, snd_gus_interrupt, SA_INTERRUPT, "GUS GF1", (void *) gus)) { 182 if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) {
183 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq); 183 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
184 snd_gus_free(gus); 184 snd_gus_free(gus);
185 return -EBUSY; 185 return -EBUSY;
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 05852fcc613b..22cdddbfd824 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -301,7 +301,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev)
301 (err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, 301 (err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
302 es1688->mpu_port, 0, 302 es1688->mpu_port, 0,
303 xmpu_irq, 303 xmpu_irq,
304 SA_INTERRUPT, 304 IRQF_DISABLED,
305 NULL)) < 0) 305 NULL)) < 0)
306 goto out; 306 goto out;
307 307
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index fcf2c8fe6f94..ac11cae8589a 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -292,7 +292,7 @@ static int __init snd_gusmax_probe(struct platform_device *pdev)
292 goto _err; 292 goto _err;
293 } 293 }
294 294
295 if (request_irq(xirq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void *)maxcard)) { 295 if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) {
296 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); 296 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
297 err = -EBUSY; 297 err = -EBUSY;
298 goto _err; 298 goto _err;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index c1c86e0fa56d..ea69f25506fb 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -706,7 +706,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
706 if ((err = snd_gus_initialize(gus)) < 0) 706 if ((err = snd_gus_initialize(gus)) < 0)
707 return err; 707 return err;
708 708
709 if (request_irq(xirq, snd_interwave_interrupt, SA_INTERRUPT, 709 if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED,
710 "InterWave", iwcard)) { 710 "InterWave", iwcard)) {
711 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); 711 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
712 return -EBUSY; 712 return -EBUSY;