Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ca68b3 authored Jul 01, 2006 by Thomas Gleixner Committed by Linus Torvalds Jul 02, 2006

[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>

parent 63a43399

include/sound/initval.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table)
		{
		while (*irq_table != -1) {
		if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,
		SA_INTERRUPT \| SA_PROBEIRQ, "ALSA Test IRQ",
		IRQF_DISABLED \| IRQF_PROBE_SHARED, "ALSA Test IRQ",
		(void *) irq_table)) {
		free_irq(irq_table, (void ) irq_table);
		return *irq_table;

sound/arm/aaci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -360,7 +360,7 @@ static int aaci_pcm_open(struct aaci aaci, struct snd_pcm_substream substream,
		if (ret)
		goto out;

		ret = request_irq(aaci->dev->irq[0], aaci_irq, SA_SHIRQ\|SA_INTERRUPT,
		ret = request_irq(aaci->dev->irq[0], aaci_irq, IRQF_SHARED\|IRQF_DISABLED,
		DRIVER_NAME, aaci);
		if (ret)
		goto out;

sound/drivers/mpu401/mpu401.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
		if ((err = snd_mpu401_uart_new(card, 0,
		MPU401_HW_MPU401,
		port[dev], 0,
		irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) {
		irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL)) < 0) {
		printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
		goto _err;
		}

sound/drivers/mtpav.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -590,7 +590,7 @@ static int __init snd_mtpav_get_ISA(struct mtpav * mcard)
		return -EBUSY;
		}
		mcard->port = port;
		if (request_irq(irq, snd_mtpav_irqh, SA_INTERRUPT, "MOTU MTPAV", mcard)) {
		if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
		snd_printk("MTVAP IRQ %d busy\n", irq);
		return -EBUSY;
		}

sound/drivers/serial-u16550.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -795,7 +795,7 @@ static int __init snd_uart16550_create(struct snd_card *card,

		if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
		if (request_irq(irq, snd_uart16550_interrupt,
		SA_INTERRUPT, "Serial MIDI", (void *) uart)) {
		IRQF_DISABLED, "Serial MIDI", (void *) uart)) {
		snd_printk("irq %d busy. Using Polling.\n", irq);
		} else {
		uart->irq = irq;