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 | |
| 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>
102 files changed, 109 insertions, 109 deletions
diff --git a/include/sound/initval.h b/include/sound/initval.h index d45170b9e0b7..2ae76efc696f 100644 --- a/include/sound/initval.h +++ b/include/sound/initval.h | |||
| @@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table) | |||
| 62 | { | 62 | { |
| 63 | while (*irq_table != -1) { | 63 | while (*irq_table != -1) { |
| 64 | if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, | 64 | if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, |
| 65 | SA_INTERRUPT | SA_PROBEIRQ, "ALSA Test IRQ", | 65 | IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ", |
| 66 | (void *) irq_table)) { | 66 | (void *) irq_table)) { |
| 67 | free_irq(*irq_table, (void *) irq_table); | 67 | free_irq(*irq_table, (void *) irq_table); |
| 68 | return *irq_table; | 68 | return *irq_table; |
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 6b18225672c7..8435fdd1c87c 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
| @@ -360,7 +360,7 @@ static int aaci_pcm_open(struct aaci *aaci, struct snd_pcm_substream *substream, | |||
| 360 | if (ret) | 360 | if (ret) |
| 361 | goto out; | 361 | goto out; |
| 362 | 362 | ||
| 363 | ret = request_irq(aaci->dev->irq[0], aaci_irq, SA_SHIRQ|SA_INTERRUPT, | 363 | ret = request_irq(aaci->dev->irq[0], aaci_irq, IRQF_SHARED|IRQF_DISABLED, |
| 364 | DRIVER_NAME, aaci); | 364 | DRIVER_NAME, aaci); |
| 365 | if (ret) | 365 | if (ret) |
| 366 | goto out; | 366 | goto out; |
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, |