Merge branch 'topic/remove-irqf_disable' into for-linus

4 files changed, 5 insertions, 5 deletions

diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c
index 5cfcb908c430..2c7a7636f472 100644
--- a/sound/drivers/ml403-ac97cr.c
+++ b/sound/drivers/ml403-ac97cr.c
@@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
                    "0x%x done\n", (unsigned int)ml403_ac97cr->port);
         /* get irq */
         irq = platform_get_irq(pfdev, 0);
-        if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
+        if (request_irq(irq, snd_ml403_ac97cr_irq, 0,
                         dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
                 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
                            "unable to grab IRQ %d\n",
@@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card *card, struct platform_device *pfdev,
                    "request (playback) irq %d done\n",
                    ml403_ac97cr->irq);
         irq = platform_get_irq(pfdev, 1);
-        if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
+        if (request_irq(irq, snd_ml403_ac97cr_irq, 0,
                         dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
                 snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
                            "unable to grab IRQ %d\n",
diff --git a/sound/drivers/mpu401/mpu401_uart.c b/sound/drivers/mpu401/mpu401_uart.c
index 9d01c181feca..e91698a634b2 100644
--- a/sound/drivers/mpu401/mpu401_uart.c
+++ b/sound/drivers/mpu401/mpu401_uart.c
@@ -577,7 +577,7 @@ int snd_mpu401_uart_new(struct snd_card *card, int device,
         else
                 mpu->cport = port + 1;
         if (irq >= 0) {
-                if (request_irq(irq, snd_mpu401_uart_interrupt, IRQF_DISABLED,
+                if (request_irq(irq, snd_mpu401_uart_interrupt, 0,
                                 "MPU401 UART", (void *) mpu)) {
                         snd_printk(KERN_ERR "mpu401_uart: "
                                    "unable to grab IRQ %d\n", irq);
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 5c426df87678..1eef4ccebe4b 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -589,7 +589,7 @@ static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
                 return -EBUSY;
         }
         mcard->port = port;
-        if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
+        if (request_irq(irq, snd_mtpav_irqh, 0, "MOTU MTPAV", mcard)) {
                 snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
                 return -EBUSY;
         }
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index a25fb7b1f441..fc1d822802c3 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -816,7 +816,7 @@ static int __devinit snd_uart16550_create(struct snd_card *card,
 
         if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
                 if (request_irq(irq, snd_uart16550_interrupt,
-                                IRQF_DISABLED, "Serial MIDI", uart)) {
+                                0, "Serial MIDI", uart)) {
                         snd_printk(KERN_WARNING
                                    "irq %d busy. Using Polling.\n", irq);
                 } else {