You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[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>
This commit is contained in:
committed by
Linus Torvalds
parent
63a43399db
commit
65ca68b300
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -232,7 +232,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
|
||||
|
||||
if (mpu_port[dev] > 0) {
|
||||
if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
|
||||
mpu_port[dev], 0, mpu_irq[dev], SA_INTERRUPT,
|
||||
mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,
|
||||
NULL) < 0)
|
||||
printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]);
|
||||
}
|
||||
|
||||
@@ -599,7 +599,7 @@ int __devinit snd_ad1816a_create(struct snd_card *card,
|
||||
snd_ad1816a_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
if (request_irq(irq, snd_ad1816a_interrupt, SA_INTERRUPT, "AD1816A", (void *) chip)) {
|
||||
if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) {
|
||||
snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
|
||||
snd_ad1816a_free(chip);
|
||||
return -EBUSY;
|
||||
|
||||
@@ -902,7 +902,7 @@ int snd_ad1848_create(struct snd_card *card,
|
||||
snd_ad1848_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
if (request_irq(irq, snd_ad1848_interrupt, SA_INTERRUPT, "AD1848", (void *) chip)) {
|
||||
if (request_irq(irq, snd_ad1848_interrupt, IRQF_DISABLED, "AD1848", (void *) chip)) {
|
||||
snd_printk(KERN_ERR "ad1848: can't grab IRQ %d\n", irq);
|
||||
snd_ad1848_free(chip);
|
||||
return -EBUSY;
|
||||
|
||||
+1
-1
@@ -250,7 +250,7 @@ static int __devinit snd_card_als100_probe(int dev,
|
||||
if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
|
||||
if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100,
|
||||
mpu_port[dev], 0,
|
||||
mpu_irq[dev], SA_INTERRUPT,
|
||||
mpu_irq[dev], IRQF_DISABLED,
|
||||
NULL) < 0)
|
||||
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
|
||||
}
|
||||
|
||||
+1
-1
@@ -279,7 +279,7 @@ static int __devinit snd_card_azt2320_probe(int dev,
|
||||
if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
|
||||
if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
|
||||
mpu_port[dev], 0,
|
||||
mpu_irq[dev], SA_INTERRUPT,
|
||||
mpu_irq[dev], IRQF_DISABLED,
|
||||
NULL) < 0)
|
||||
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ static int __init snd_cs4231_probe(struct platform_device *pdev)
|
||||
if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
|
||||
mpu_port[dev], 0,
|
||||
mpu_irq[dev],
|
||||
mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0,
|
||||
mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
|
||||
NULL) < 0)
|
||||
printk(KERN_WARNING "cs4231: MPU401 not detected\n");
|
||||
}
|
||||
|
||||
@@ -1454,7 +1454,7 @@ int snd_cs4231_create(struct snd_card *card,
|
||||
return -ENODEV;
|
||||
}
|
||||
chip->cport = cport;
|
||||
if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, SA_INTERRUPT, "CS4231", (void *) chip)) {
|
||||
if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, IRQF_DISABLED, "CS4231", (void *) chip)) {
|
||||
snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq);
|
||||
snd_cs4231_free(chip);
|
||||
return -EBUSY;
|
||||
|
||||
@@ -535,7 +535,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
|
||||
if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
|
||||
mpu_port[dev], 0,
|
||||
mpu_irq[dev],
|
||||
mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0)
|
||||
mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0)
|
||||
printk(KERN_WARNING IDENT ": MPU401 not detected\n");
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -240,7 +240,7 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
|
||||
MPU401_HW_MPU401,
|
||||
mpu_port[dev], 0,
|
||||
mpu_irq[dev],
|
||||
mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0,
|
||||
mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
|
||||
NULL) < 0)
|
||||
snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@ static int __init snd_es1688_probe(struct platform_device *pdev)
|
||||
if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
|
||||
chip->mpu_port, 0,
|
||||
xmpu_irq,
|
||||
SA_INTERRUPT,
|
||||
IRQF_DISABLED,
|
||||
NULL)) < 0)
|
||||
goto _err;
|
||||
}
|
||||
|
||||
@@ -659,7 +659,7 @@ int snd_es1688_create(struct snd_card *card,
|
||||
snd_es1688_free(chip);
|
||||
return -EBUSY;
|
||||
}
|
||||
if (request_irq(irq, snd_es1688_interrupt, SA_INTERRUPT, "ES1688", (void *) chip)) {
|
||||
if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) {
|
||||
snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
|
||||
snd_es1688_free(chip);
|
||||
return -EBUSY;
|
||||
|
||||
+1
-1
@@ -1837,7 +1837,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
if (request_irq(irq, snd_es18xx_interrupt, SA_INTERRUPT, "ES18xx", (void *) chip)) {
|
||||
if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", (void *) chip)) {
|
||||
snd_es18xx_free(chip);
|
||||
snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
|
||||
return -EBUSY;
|
||||
|
||||
@@ -179,7 +179,7 @@ int snd_gus_create(struct snd_card *card,
|
||||
snd_gus_free(gus);
|
||||
return -EBUSY;
|
||||
}
|
||||
if (irq >= 0 && request_irq(irq, snd_gus_interrupt, SA_INTERRUPT, "GUS GF1", (void *) gus)) {
|
||||
if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) {
|
||||
snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
|
||||
snd_gus_free(gus);
|
||||
return -EBUSY;
|
||||
|
||||
@@ -301,7 +301,7 @@ static int __init snd_gusextreme_probe(struct platform_device *pdev)
|
||||
(err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
|
||||
es1688->mpu_port, 0,
|
||||
xmpu_irq,
|
||||
SA_INTERRUPT,
|
||||
IRQF_DISABLED,
|
||||
NULL)) < 0)
|
||||
goto out;
|
||||
|
||||
|
||||
@@ -292,7 +292,7 @@ static int __init snd_gusmax_probe(struct platform_device *pdev)
|
||||
goto _err;
|
||||
}
|
||||
|
||||
if (request_irq(xirq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void *)maxcard)) {
|
||||
if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) {
|
||||
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
|
||||
err = -EBUSY;
|
||||
goto _err;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user