aboutsummaryrefslogtreecommitdiffstats
path: root/sound/drivers
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/drivers
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/drivers')
-rw-r--r--sound/drivers/mpu401/mpu401.c2
-rw-r--r--sound/drivers/mtpav.c2
-rw-r--r--sound/drivers/serial-u16550.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 8b80024968be..17cc105b26fc 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -83,7 +83,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
83 if ((err = snd_mpu401_uart_new(card, 0, 83 if ((err = snd_mpu401_uart_new(card, 0,
84 MPU401_HW_MPU401, 84 MPU401_HW_MPU401,
85 port[dev], 0, 85 port[dev], 0,
86 irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) { 86 irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL)) < 0) {
87 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]); 87 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
88 goto _err; 88 goto _err;
89 } 89 }
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 474eed06e70f..e064d6c5685b 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -590,7 +590,7 @@ static int __init snd_mtpav_get_ISA(struct mtpav * mcard)
590 return -EBUSY; 590 return -EBUSY;
591 } 591 }
592 mcard->port = port; 592 mcard->port = port;
593 if (request_irq(irq, snd_mtpav_irqh, SA_INTERRUPT, "MOTU MTPAV", mcard)) { 593 if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
594 snd_printk("MTVAP IRQ %d busy\n", irq); 594 snd_printk("MTVAP IRQ %d busy\n", irq);
595 return -EBUSY; 595 return -EBUSY;
596 } 596 }
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 2330fec505da..52afb4bd2079 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -795,7 +795,7 @@ static int __init snd_uart16550_create(struct snd_card *card,
795 795
796 if (irq >= 0 && irq != SNDRV_AUTO_IRQ) { 796 if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
797 if (request_irq(irq, snd_uart16550_interrupt, 797 if (request_irq(irq, snd_uart16550_interrupt,
798 SA_INTERRUPT, "Serial MIDI", (void *) uart)) { 798 IRQF_DISABLED, "Serial MIDI", (void *) uart)) {
799 snd_printk("irq %d busy. Using Polling.\n", irq); 799 snd_printk("irq %d busy. Using Polling.\n", irq);
800 } else { 800 } else {
801 uart->irq = irq; 801 uart->irq = irq;