diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:54 -0400 |
commit | 65ca68b30073473583f6ca2f463cbd94ade43ddb (patch) | |
tree | f7d4384450fbdfcb2661a74f3c2f28e53721eeb0 /sound/isa/cs423x | |
parent | 63a43399db67d6f94364f933f68f38f58387737a (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/cs423x')
-rw-r--r-- | sound/isa/cs423x/cs4231.c | 2 | ||||
-rw-r--r-- | sound/isa/cs423x/cs4231_lib.c | 2 | ||||
-rw-r--r-- | sound/isa/cs423x/cs4236.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c index 397310f358b7..696a5c86bcfa 100644 --- a/sound/isa/cs423x/cs4231.c +++ b/sound/isa/cs423x/cs4231.c | |||
@@ -122,7 +122,7 @@ static int __init snd_cs4231_probe(struct platform_device *pdev) | |||
122 | if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232, | 122 | if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232, |
123 | mpu_port[dev], 0, | 123 | mpu_port[dev], 0, |
124 | mpu_irq[dev], | 124 | mpu_irq[dev], |
125 | mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, | 125 | mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, |
126 | NULL) < 0) | 126 | NULL) < 0) |
127 | printk(KERN_WARNING "cs4231: MPU401 not detected\n"); | 127 | printk(KERN_WARNING "cs4231: MPU401 not detected\n"); |
128 | } | 128 | } |
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c index 823db8246701..fbb20176cca4 100644 --- a/sound/isa/cs423x/cs4231_lib.c +++ b/sound/isa/cs423x/cs4231_lib.c | |||
@@ -1454,7 +1454,7 @@ int snd_cs4231_create(struct snd_card *card, | |||
1454 | return -ENODEV; | 1454 | return -ENODEV; |
1455 | } | 1455 | } |
1456 | chip->cport = cport; | 1456 | chip->cport = cport; |
1457 | if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, SA_INTERRUPT, "CS4231", (void *) chip)) { | 1457 | if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, IRQF_DISABLED, "CS4231", (void *) chip)) { |
1458 | snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq); | 1458 | snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq); |
1459 | snd_cs4231_free(chip); | 1459 | snd_cs4231_free(chip); |
1460 | return -EBUSY; | 1460 | return -EBUSY; |
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index f7fa779347ff..07ffd5c22e81 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
@@ -535,7 +535,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev) | |||
535 | if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232, | 535 | if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232, |
536 | mpu_port[dev], 0, | 536 | mpu_port[dev], 0, |
537 | mpu_irq[dev], | 537 | mpu_irq[dev], |
538 | mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) | 538 | mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0) |
539 | printk(KERN_WARNING IDENT ": MPU401 not detected\n"); | 539 | printk(KERN_WARNING IDENT ": MPU401 not detected\n"); |
540 | } | 540 | } |
541 | 541 | ||