23 files changed, 25 insertions, 25 deletions

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 31f299aed281..b33a5fb59ec2 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -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]);
         }
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index fd8fe16c09ee..8fcf2c151823 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -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;
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index e0f8baa843b9..e711f87d5fd1 100644
--- a/sound/isa/ad1848/ad1848_lib.c
+++ b/sound/isa/ad1848/ad1848_lib.c
@@ -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;
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index a52bd8a14c9b..f2bcfb2cf5f5 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -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]);
         }
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index 15e59283aac6..b615538a928d 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -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]);
         }
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index 397310f358b7..696a5c86bcfa 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -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");
         }
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index 823db8246701..fbb20176cca4 100644
--- a/sound/isa/cs423x/cs4231_lib.c
+++ b/sound/isa/cs423x/cs4231_lib.c
@@ -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;
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index f7fa779347ff..07ffd5c22e81 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -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");
         }
 
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index 0acb4e5da47f..c20a4b1b1536 100644
--- a/sound/isa/dt019x.c
+++ b/sound/isa/dt019x.c
@@ -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]);
         }
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index e90689ee162f..7f29f56e405b 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -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;
         }
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 702ad51ee9d5..7e985d3bc510 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -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;
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index af60b0bc8115..34998de9968c 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -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;
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 53eeaf37007d..b680fddf0d74 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -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;
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 05852fcc613b..22cdddbfd824 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -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;
 
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index fcf2c8fe6f94..ac11cae8589a 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -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;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index c1c86e0fa56d..ea69f25506fb 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -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;
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 647a996791e9..4031b61b797f 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -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;
         }
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 283817f2de75..1dd98375ac85 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -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);
 
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 8ee0d70536f9..9d528ae00bff 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -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);
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index f343a8211d2d..f17de2bdd9e0 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -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);
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 09c8e8c6b5e3..8742fa517491 100644
--- a/sound/isa/sgalaxy.c
+++ b/sound/isa/sgalaxy.c
@@ -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;
         }
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 27271c9446dc..b1f25823c652 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -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;
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 9eb27082c659..a8f8d2fa9d76 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -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;