[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

szülő
63a43399db
commit
65ca68b300
@@ -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;
|
||||
|
@@ -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]);
|
||||
}
|
||||
|
@@ -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");
|
||||
}
|
||||
|
||||
|
@@ -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;
|
||||
|
@@ -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;
|
||||
|
@@ -706,7 +706,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
|
||||
if ((err = snd_gus_initialize(gus)) < 0)
|
||||
return err;
|
||||
|
||||
if (request_irq(xirq, snd_interwave_interrupt, SA_INTERRUPT,
|
||||
if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED,
|
||||
"InterWave", iwcard)) {
|
||||
snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
|
||||
return -EBUSY;
|
||||
|
@@ -683,7 +683,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
|
||||
chip->single_dma = 1;
|
||||
if ((err = snd_opl3sa2_detect(chip)) < 0)
|
||||
return err;
|
||||
if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2", chip)) {
|
||||
if (request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED, "OPL3-SA2", chip)) {
|
||||
snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
@@ -1382,7 +1382,7 @@ static int __init snd_miro_probe(struct platform_device *devptr)
|
||||
rmidi = NULL;
|
||||
else
|
||||
if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
|
||||
miro->mpu_port, 0, miro->mpu_irq, SA_INTERRUPT,
|
||||
miro->mpu_port, 0, miro->mpu_irq, IRQF_DISABLED,
|
||||
&rmidi)))
|
||||
snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port);
|
||||
|
||||
|
@@ -1291,7 +1291,7 @@ static int snd_opti93x_create(struct snd_card *card, struct snd_opti9xx *chip,
|
||||
}
|
||||
codec->dma2 = chip->dma2;
|
||||
|
||||
if (request_irq(chip->irq, snd_opti93x_interrupt, SA_INTERRUPT, DRIVER_NAME" - WSS", codec)) {
|
||||
if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) {
|
||||
snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
|
||||
snd_opti93x_free(codec);
|
||||
return -EBUSY;
|
||||
@@ -1863,7 +1863,7 @@ static int __init snd_opti9xx_probe(struct snd_card *card)
|
||||
rmidi = NULL;
|
||||
else
|
||||
if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
|
||||
chip->mpu_port, 0, chip->mpu_irq, SA_INTERRUPT,
|
||||
chip->mpu_port, 0, chip->mpu_irq, IRQF_DISABLED,
|
||||
&rmidi)))
|
||||
snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",
|
||||
chip->mpu_port);
|
||||
|
@@ -232,7 +232,7 @@ int snd_sbdsp_create(struct snd_card *card,
|
||||
chip->port = port;
|
||||
|
||||
if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ?
|
||||
SA_INTERRUPT | SA_SHIRQ : SA_INTERRUPT,
|
||||
IRQF_DISABLED | IRQF_SHARED : IRQF_DISABLED,
|
||||
"SoundBlaster", (void *) chip)) {
|
||||
snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
|
||||
snd_sbdsp_free(chip);
|
||||
|
@@ -147,7 +147,7 @@ static int __init snd_sgalaxy_setup_wss(unsigned long port, int irq, int dma)
|
||||
if (tmp < 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy", NULL)) {
|
||||
if (request_irq(irq, snd_sgalaxy_dummy_interrupt, IRQF_DISABLED, "sgalaxy", NULL)) {
|
||||
snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
|
||||
return -EIO;
|
||||
}
|
||||
|
@@ -900,7 +900,7 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum, unsigned l
|
||||
if ((err = snd_mpu401_uart_new(card, devnum,
|
||||
MPU401_HW_MPU401,
|
||||
port, MPU401_INFO_INTEGRATED,
|
||||
irq, SA_INTERRUPT,
|
||||
irq, IRQF_DISABLED,
|
||||
&rawmidi)) == 0) {
|
||||
struct snd_mpu401 *mpu = (struct snd_mpu401 *) rawmidi->private_data;
|
||||
mpu->open_input = mpu401_open;
|
||||
|
@@ -467,7 +467,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
|
||||
return -EBUSY;
|
||||
}
|
||||
if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
|
||||
SA_INTERRUPT, "ICS2115", acard)) {
|
||||
IRQF_DISABLED, "ICS2115", acard)) {
|
||||
snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
|
||||
return -EBUSY;
|
||||
}
|
||||
@@ -497,7 +497,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
|
||||
if ((err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232,
|
||||
cs4232_mpu_port[dev], 0,
|
||||
cs4232_mpu_irq[dev],
|
||||
SA_INTERRUPT,
|
||||
IRQF_DISABLED,
|
||||
NULL)) < 0) {
|
||||
snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");
|
||||
return err;
|
||||
|
Reference in New Issue
Block a user