aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sound/initval.h2
-rw-r--r--sound/arm/aaci.c2
-rw-r--r--sound/drivers/mpu401/mpu401.c2
-rw-r--r--sound/drivers/mtpav.c2
-rw-r--r--sound/drivers/serial-u16550.c2
-rw-r--r--sound/isa/ad1816a/ad1816a.c2
-rw-r--r--sound/isa/ad1816a/ad1816a_lib.c2
-rw-r--r--sound/isa/ad1848/ad1848_lib.c2
-rw-r--r--sound/isa/als100.c2
-rw-r--r--sound/isa/azt2320.c2
-rw-r--r--sound/isa/cs423x/cs4231.c2
-rw-r--r--sound/isa/cs423x/cs4231_lib.c2
-rw-r--r--sound/isa/cs423x/cs4236.c2
-rw-r--r--sound/isa/dt019x.c2
-rw-r--r--sound/isa/es1688/es1688.c2
-rw-r--r--sound/isa/es1688/es1688_lib.c2
-rw-r--r--sound/isa/es18xx.c2
-rw-r--r--sound/isa/gus/gus_main.c2
-rw-r--r--sound/isa/gus/gusextreme.c2
-rw-r--r--sound/isa/gus/gusmax.c2
-rw-r--r--sound/isa/gus/interwave.c2
-rw-r--r--sound/isa/opl3sa2.c2
-rw-r--r--sound/isa/opti9xx/miro.c2
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c4
-rw-r--r--sound/isa/sb/sb_common.c2
-rw-r--r--sound/isa/sgalaxy.c2
-rw-r--r--sound/isa/sscape.c2
-rw-r--r--sound/isa/wavefront/wavefront.c4
-rw-r--r--sound/mips/au1x00.c4
-rw-r--r--sound/oss/ad1889.c2
-rw-r--r--sound/oss/ali5455.c2
-rw-r--r--sound/oss/au1000.c4
-rw-r--r--sound/oss/btaudio.c2
-rw-r--r--sound/oss/cmpci.c2
-rw-r--r--sound/oss/cs4281/cs4281m.c2
-rw-r--r--sound/oss/cs46xx.c2
-rw-r--r--sound/oss/emu10k1/main.c2
-rw-r--r--sound/oss/es1370.c2
-rw-r--r--sound/oss/es1371.c2
-rw-r--r--sound/oss/esssolo1.c2
-rw-r--r--sound/oss/forte.c2
-rw-r--r--sound/oss/hal2.c2
-rw-r--r--sound/oss/i810_audio.c2
-rw-r--r--sound/oss/ite8172.c2
-rw-r--r--sound/oss/maestro.c2
-rw-r--r--sound/oss/maestro3.c2
-rw-r--r--sound/oss/nec_vrc5477.c2
-rw-r--r--sound/oss/nm256_audio.c2
-rw-r--r--sound/oss/rme96xx.c2
-rw-r--r--sound/oss/sb_common.c2
-rw-r--r--sound/oss/sh_dac_audio.c2
-rw-r--r--sound/oss/sonicvibes.c2
-rw-r--r--sound/oss/trident.c2
-rw-r--r--sound/oss/via82cxxx_audio.c4
-rw-r--r--sound/oss/wavfront.c2
-rw-r--r--sound/oss/wf_midi.c2
-rw-r--r--sound/oss/ymfpci.c2
-rw-r--r--sound/pci/ad1889.c2
-rw-r--r--sound/pci/ali5451/ali5451.c2
-rw-r--r--sound/pci/als300.c2
-rw-r--r--sound/pci/atiixp.c2
-rw-r--r--sound/pci/atiixp_modem.c2
-rw-r--r--sound/pci/au88x0/au88x0.c2
-rw-r--r--sound/pci/azt3328.c2
-rw-r--r--sound/pci/bt87x.c2
-rw-r--r--sound/pci/ca0106/ca0106_main.c2
-rw-r--r--sound/pci/cmipci.c2
-rw-r--r--sound/pci/cs4281.c2
-rw-r--r--sound/pci/cs46xx/cs46xx_lib.c2
-rw-r--r--sound/pci/cs5535audio/cs5535audio.c2
-rw-r--r--sound/pci/echoaudio/echoaudio.c2
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c2
-rw-r--r--sound/pci/emu10k1/emu10k1x.c2
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/es1938.c4
-rw-r--r--sound/pci/es1968.c2
-rw-r--r--sound/pci/fm801.c2
-rw-r--r--sound/pci/hda/hda_intel.c2
-rw-r--r--sound/pci/ice1712/ice1712.c2
-rw-r--r--sound/pci/ice1712/ice1724.c2
-rw-r--r--sound/pci/intel8x0.c4
-rw-r--r--sound/pci/intel8x0m.c2
-rw-r--r--sound/pci/korg1212/korg1212.c2
-rw-r--r--sound/pci/maestro3.c2
-rw-r--r--sound/pci/mixart/mixart.c2
-rw-r--r--sound/pci/nm256/nm256.c2
-rw-r--r--sound/pci/pcxhr/pcxhr.c2
-rw-r--r--sound/pci/riptide/riptide.c2
-rw-r--r--sound/pci/rme32.c2
-rw-r--r--sound/pci/rme96.c2
-rw-r--r--sound/pci/rme9652/hdsp.c2
-rw-r--r--sound/pci/rme9652/hdspm.c2
-rw-r--r--sound/pci/rme9652/rme9652.c2
-rw-r--r--sound/pci/sonicvibes.c2
-rw-r--r--sound/pci/trident/trident_main.c2
-rw-r--r--sound/pci/via82xx.c2
-rw-r--r--sound/pci/via82xx_modem.c2
-rw-r--r--sound/pci/vx222/vx222.c2
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c2
-rw-r--r--sound/sparc/amd7930.c2
-rw-r--r--sound/sparc/cs4231.c2
-rw-r--r--sound/sparc/dbri.c2
102 files changed, 109 insertions, 109 deletions
diff --git a/include/sound/initval.h b/include/sound/initval.h
index d45170b9e0b..2ae76efc696 100644
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -62,7 +62,7 @@ static int snd_legacy_find_free_irq(int *irq_table)
62{ 62{
63 while (*irq_table != -1) { 63 while (*irq_table != -1) {
64 if (!request_irq(*irq_table, snd_legacy_empty_irq_handler, 64 if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,
65 SA_INTERRUPT | SA_PROBEIRQ, "ALSA Test IRQ", 65 IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ",
66 (void *) irq_table)) { 66 (void *) irq_table)) {
67 free_irq(*irq_table, (void *) irq_table); 67 free_irq(*irq_table, (void *) irq_table);
68 return *irq_table; 68 return *irq_table;
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 6b18225672c..8435fdd1c87 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -360,7 +360,7 @@ static int aaci_pcm_open(struct aaci *aaci, struct snd_pcm_substream *substream,
360 if (ret) 360 if (ret)
361 goto out; 361 goto out;
362 362
363 ret = request_irq(aaci->dev->irq[0], aaci_irq, SA_SHIRQ|SA_INTERRUPT, 363 ret = request_irq(aaci->dev->irq[0], aaci_irq, IRQF_SHARED|IRQF_DISABLED,
364 DRIVER_NAME, aaci); 364 DRIVER_NAME, aaci);
365 if (ret) 365 if (ret)
366 goto out; 366 goto out;
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index 8b80024968b..17cc105b26f 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -83,7 +83,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
83 if ((err = snd_mpu401_uart_new(card, 0, 83 if ((err = snd_mpu401_uart_new(card, 0,
84 MPU401_HW_MPU401, 84 MPU401_HW_MPU401,
85 port[dev], 0, 85 port[dev], 0,
86 irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) { 86 irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL)) < 0) {
87 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]); 87 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
88 goto _err; 88 goto _err;
89 } 89 }
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 474eed06e70..e064d6c5685 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -590,7 +590,7 @@ static int __init snd_mtpav_get_ISA(struct mtpav * mcard)
590 return -EBUSY; 590 return -EBUSY;
591 } 591 }
592 mcard->port = port; 592 mcard->port = port;
593 if (request_irq(irq, snd_mtpav_irqh, SA_INTERRUPT, "MOTU MTPAV", mcard)) { 593 if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
594 snd_printk("MTVAP IRQ %d busy\n", irq); 594 snd_printk("MTVAP IRQ %d busy\n", irq);
595 return -EBUSY; 595 return -EBUSY;
596 } 596 }
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 2330fec505d..52afb4bd207 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -795,7 +795,7 @@ static int __init snd_uart16550_create(struct snd_card *card,
795 795
796 if (irq >= 0 && irq != SNDRV_AUTO_IRQ) { 796 if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
797 if (request_irq(irq, snd_uart16550_interrupt, 797 if (request_irq(irq, snd_uart16550_interrupt,
798 SA_INTERRUPT, "Serial MIDI", (void *) uart)) { 798 IRQF_DISABLED, "Serial MIDI", (void *) uart)) {
799 snd_printk("irq %d busy. Using Polling.\n", irq); 799 snd_printk("irq %d busy. Using Polling.\n", irq);
800 } else { 800 } else {
801 uart->irq = irq; 801 uart->irq = irq;
diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 31f299aed28..b33a5fb59ec 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
232 232
233 if (mpu_port[dev] > 0) { 233 if (mpu_port[dev] > 0) {
234 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, 234 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
235 mpu_port[dev], 0, mpu_irq[dev], SA_INTERRUPT, 235 mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,
236 NULL) < 0) 236 NULL) < 0)
237 printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]); 237 printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]);
238 } 238 }
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index fd8fe16c09e..8fcf2c15182 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,
599 snd_ad1816a_free(chip); 599 snd_ad1816a_free(chip);
600 return -EBUSY; 600 return -EBUSY;
601 } 601 }
602 if (request_irq(irq, snd_ad1816a_interrupt, SA_INTERRUPT, "AD1816A", (void *) chip)) { 602 if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) {
603 snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq); 603 snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
604 snd_ad1816a_free(chip); 604 snd_ad1816a_free(chip);
605 return -EBUSY; 605 return -EBUSY;
diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c
index e0f8baa843b..e711f87d5fd 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,
902 snd_ad1848_free(chip); 902 snd_ad1848_free(chip);
903 return -EBUSY; 903 return -EBUSY;
904 } 904 }
905 if (request_irq(irq, snd_ad1848_interrupt, SA_INTERRUPT, "AD1848", (void *) chip)) { 905 if (request_irq(irq, snd_ad1848_interrupt, IRQF_DISABLED, "AD1848", (void *) chip)) {
906 snd_printk(KERN_ERR "ad1848: can't grab IRQ %d\n", irq); 906 snd_printk(KERN_ERR "ad1848: can't grab IRQ %d\n", irq);
907 snd_ad1848_free(chip); 907 snd_ad1848_free(chip);
908 return -EBUSY; 908 return -EBUSY;
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index a52bd8a14c9..f2bcfb2cf5f 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -250,7 +250,7 @@ static int __devinit snd_card_als100_probe(int dev,
250 if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) { 250 if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
251 if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100, 251 if (snd_mpu401_uart_new(card, 0, MPU401_HW_ALS100,
252 mpu_port[dev], 0, 252 mpu_port[dev], 0,
253 mpu_irq[dev], SA_INTERRUPT, 253 mpu_irq[dev], IRQF_DISABLED,
254 NULL) < 0) 254 NULL) < 0)
255 snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]); 255 snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
256 } 256 }
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index 15e59283aac..b615538a928 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -279,7 +279,7 @@ static int __devinit snd_card_azt2320_probe(int dev,
279 if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) { 279 if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
280 if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320, 280 if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
281 mpu_port[dev], 0, 281 mpu_port[dev], 0,
282 mpu_irq[dev], SA_INTERRUPT, 282 mpu_irq[dev], IRQF_DISABLED,
283 NULL) < 0) 283 NULL) < 0)
284 snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]); 284 snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
285 } 285 }
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index 397310f358b..696a5c86bcf 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)
122 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232, 122 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
123 mpu_port[dev], 0, 123 mpu_port[dev], 0,
124 mpu_irq[dev], 124 mpu_irq[dev],
125 mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, 125 mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
126 NULL) < 0) 126 NULL) < 0)
127 printk(KERN_WARNING "cs4231: MPU401 not detected\n"); 127 printk(KERN_WARNING "cs4231: MPU401 not detected\n");
128 } 128 }
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c
index 823db824670..fbb20176cca 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,
1454 return -ENODEV; 1454 return -ENODEV;
1455 } 1455 }
1456 chip->cport = cport; 1456 chip->cport = cport;
1457 if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, SA_INTERRUPT, "CS4231", (void *) chip)) { 1457 if (!(hwshare & CS4231_HWSHARE_IRQ) && request_irq(irq, snd_cs4231_interrupt, IRQF_DISABLED, "CS4231", (void *) chip)) {
1458 snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq); 1458 snd_printk(KERN_ERR "cs4231: can't grab IRQ %d\n", irq);
1459 snd_cs4231_free(chip); 1459 snd_cs4231_free(chip);
1460 return -EBUSY; 1460 return -EBUSY;
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index f7fa779347f..07ffd5c22e8 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)
535 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232, 535 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
536 mpu_port[dev], 0, 536 mpu_port[dev], 0,
537 mpu_irq[dev], 537 mpu_irq[dev],
538 mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) 538 mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0)
539 printk(KERN_WARNING IDENT ": MPU401 not detected\n"); 539 printk(KERN_WARNING IDENT ": MPU401 not detected\n");
540 } 540 }
541 541
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c
index 0acb4e5da47..c20a4b1b153 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,
240 MPU401_HW_MPU401, 240 MPU401_HW_MPU401,
241 mpu_port[dev], 0, 241 mpu_port[dev], 0,
242 mpu_irq[dev], 242 mpu_irq[dev],
243 mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, 243 mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
244 NULL) < 0) 244 NULL) < 0)
245 snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]); 245 snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx ?\n", mpu_port[dev]);
246 } 246 }
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index e90689ee162..7f29f56e405 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)
153 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, 153 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
154 chip->mpu_port, 0, 154 chip->mpu_port, 0,
155 xmpu_irq, 155 xmpu_irq,
156 SA_INTERRUPT, 156 IRQF_DISABLED,
157 NULL)) < 0) 157 NULL)) < 0)
158 goto _err; 158 goto _err;
159 } 159 }
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 702ad51ee9d..7e985d3bc51 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,
659 snd_es1688_free(chip); 659 snd_es1688_free(chip);
660 return -EBUSY; 660 return -EBUSY;
661 } 661 }
662 if (request_irq(irq, snd_es1688_interrupt, SA_INTERRUPT, "ES1688", (void *) chip)) { 662 if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) {
663 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq); 663 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
664 snd_es1688_free(chip); 664 snd_es1688_free(chip);
665 return -EBUSY; 665 return -EBUSY;
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index af60b0bc811..34998de9968 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,
1837 return -EBUSY; 1837 return -EBUSY;
1838 } 1838 }
1839 1839
1840 if (request_irq(irq, snd_es18xx_interrupt, SA_INTERRUPT, "ES18xx", (void *) chip)) { 1840 if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", (void *) chip)) {
1841 snd_es18xx_free(chip); 1841 snd_es18xx_free(chip);
1842 snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq); 1842 snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
1843 return -EBUSY; 1843 return -EBUSY;
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 53eeaf37007..b680fddf0d7 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,
179 snd_gus_free(gus); 179 snd_gus_free(gus);
180 return -EBUSY; 180 return -EBUSY;
181 } 181 }
182 if (irq >= 0 && request_irq(irq, snd_gus_interrupt, SA_INTERRUPT, "GUS GF1", (void *) gus)) { 182 if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) {
183 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq); 183 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
184 snd_gus_free(gus); 184 snd_gus_free(gus);
185 return -EBUSY; 185 return -EBUSY;
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 05852fcc613..22cdddbfd82 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)
301 (err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688, 301 (err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
302 es1688->mpu_port, 0, 302 es1688->mpu_port, 0,
303 xmpu_irq, 303 xmpu_irq,
304 SA_INTERRUPT, 304 IRQF_DISABLED,
305 NULL)) < 0) 305 NULL)) < 0)
306 goto out; 306 goto out;
307 307
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index fcf2c8fe6f9..ac11cae8589 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)
292 goto _err; 292 goto _err;
293 } 293 }
294 294
295 if (request_irq(xirq, snd_gusmax_interrupt, SA_INTERRUPT, "GUS MAX", (void *)maxcard)) { 295 if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) {
296 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); 296 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
297 err = -EBUSY; 297 err = -EBUSY;
298 goto _err; 298 goto _err;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index c1c86e0fa56..ea69f25506f 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)
706 if ((err = snd_gus_initialize(gus)) < 0) 706 if ((err = snd_gus_initialize(gus)) < 0)
707 return err; 707 return err;
708 708
709 if (request_irq(xirq, snd_interwave_interrupt, SA_INTERRUPT, 709 if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED,
710 "InterWave", iwcard)) { 710 "InterWave", iwcard)) {
711 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); 711 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
712 return -EBUSY; 712 return -EBUSY;
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 647a996791e..4031b61b797 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)
683 chip->single_dma = 1; 683 chip->single_dma = 1;
684 if ((err = snd_opl3sa2_detect(chip)) < 0) 684 if ((err = snd_opl3sa2_detect(chip)) < 0)
685 return err; 685 return err;
686 if (request_irq(xirq, snd_opl3sa2_interrupt, SA_INTERRUPT, "OPL3-SA2", chip)) { 686 if (request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED, "OPL3-SA2", chip)) {
687 snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq); 687 snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq);
688 return -ENODEV; 688 return -ENODEV;
689 } 689 }
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 283817f2de7..1dd98375ac8 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)
1382 rmidi = NULL; 1382 rmidi = NULL;
1383 else 1383 else
1384 if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, 1384 if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
1385 miro->mpu_port, 0, miro->mpu_irq, SA_INTERRUPT, 1385 miro->mpu_port, 0, miro->mpu_irq, IRQF_DISABLED,
1386 &rmidi))) 1386 &rmidi)))
1387 snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port); 1387 snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", miro->mpu_port);
1388 1388
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 8ee0d70536f..9d528ae00bf 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,
1291 } 1291 }
1292 codec->dma2 = chip->dma2; 1292 codec->dma2 = chip->dma2;
1293 1293
1294 if (request_irq(chip->irq, snd_opti93x_interrupt, SA_INTERRUPT, DRIVER_NAME" - WSS", codec)) { 1294 if (request_irq(chip->irq, snd_opti93x_interrupt, IRQF_DISABLED, DRIVER_NAME" - WSS", codec)) {
1295 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq); 1295 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", chip->irq);
1296 snd_opti93x_free(codec); 1296 snd_opti93x_free(codec);
1297 return -EBUSY; 1297 return -EBUSY;
@@ -1863,7 +1863,7 @@ static int __init snd_opti9xx_probe(struct snd_card *card)
1863 rmidi = NULL; 1863 rmidi = NULL;
1864 else 1864 else
1865 if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, 1865 if ((error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
1866 chip->mpu_port, 0, chip->mpu_irq, SA_INTERRUPT, 1866 chip->mpu_port, 0, chip->mpu_irq, IRQF_DISABLED,
1867 &rmidi))) 1867 &rmidi)))
1868 snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n", 1868 snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",
1869 chip->mpu_port); 1869 chip->mpu_port);
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index f343a8211d2..f17de2bdd9e 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,
232 chip->port = port; 232 chip->port = port;
233 233
234 if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ? 234 if (request_irq(irq, irq_handler, hardware == SB_HW_ALS4000 ?
235 SA_INTERRUPT | SA_SHIRQ : SA_INTERRUPT, 235 IRQF_DISABLED | IRQF_SHARED : IRQF_DISABLED,
236 "SoundBlaster", (void *) chip)) { 236 "SoundBlaster", (void *) chip)) {
237 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq); 237 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
238 snd_sbdsp_free(chip); 238 snd_sbdsp_free(chip);
diff --git a/sound/isa/sgalaxy.c b/sound/isa/sgalaxy.c
index 09c8e8c6b5e..8742fa51749 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)
147 if (tmp < 0) 147 if (tmp < 0)
148 return -EINVAL; 148 return -EINVAL;
149 149
150 if (request_irq(irq, snd_sgalaxy_dummy_interrupt, SA_INTERRUPT, "sgalaxy", NULL)) { 150 if (request_irq(irq, snd_sgalaxy_dummy_interrupt, IRQF_DISABLED, "sgalaxy", NULL)) {
151 snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq); 151 snd_printk(KERN_ERR "sgalaxy: can't grab irq %d\n", irq);
152 return -EIO; 152 return -EIO;
153 } 153 }
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index 27271c9446d..b1f25823c65 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
900 if ((err = snd_mpu401_uart_new(card, devnum, 900 if ((err = snd_mpu401_uart_new(card, devnum,
901 MPU401_HW_MPU401, 901 MPU401_HW_MPU401,
902 port, MPU401_INFO_INTEGRATED, 902 port, MPU401_INFO_INTEGRATED,
903 irq, SA_INTERRUPT, 903 irq, IRQF_DISABLED,
904 &rawmidi)) == 0) { 904 &rawmidi)) == 0) {
905 struct snd_mpu401 *mpu = (struct snd_mpu401 *) rawmidi->private_data; 905 struct snd_mpu401 *mpu = (struct snd_mpu401 *) rawmidi->private_data;
906 mpu->open_input = mpu401_open; 906 mpu->open_input = mpu401_open;
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 9eb27082c65..a8f8d2fa9d7 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)
467 return -EBUSY; 467 return -EBUSY;
468 } 468 }
469 if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt, 469 if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
470 SA_INTERRUPT, "ICS2115", acard)) { 470 IRQF_DISABLED, "ICS2115", acard)) {
471 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]); 471 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
472 return -EBUSY; 472 return -EBUSY;
473 } 473 }
@@ -497,7 +497,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
497 if ((err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232, 497 if ((err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232,
498 cs4232_mpu_port[dev], 0, 498 cs4232_mpu_port[dev], 0,
499 cs4232_mpu_irq[dev], 499 cs4232_mpu_irq[dev],
500 SA_INTERRUPT, 500 IRQF_DISABLED,
501 NULL)) < 0) { 501 NULL)) < 0) {
502 snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n"); 502 snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");
503 return err; 503 return err;
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index cf476fe1ac5..c31b3865922 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -465,13 +465,13 @@ snd_au1000_pcm_new(struct snd_au1000 *au1000)
465 465
466 flags = claim_dma_lock(); 466 flags = claim_dma_lock();
467 if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX, 467 if ((au1000->stream[PLAYBACK]->dma = request_au1000_dma(DMA_ID_AC97C_TX,
468 "AC97 TX", au1000_dma_interrupt, SA_INTERRUPT, 468 "AC97 TX", au1000_dma_interrupt, IRQF_DISABLED,
469 au1000->stream[PLAYBACK])) < 0) { 469 au1000->stream[PLAYBACK])) < 0) {
470 release_dma_lock(flags); 470 release_dma_lock(flags);
471 return -EBUSY; 471 return -EBUSY;
472 } 472 }
473 if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX, 473 if ((au1000->stream[CAPTURE]->dma = request_au1000_dma(DMA_ID_AC97C_RX,
474 "AC97 RX", au1000_dma_interrupt, SA_INTERRUPT, 474 "AC97 RX", au1000_dma_interrupt, IRQF_DISABLED,
475 au1000->stream[CAPTURE])) < 0){ 475 au1000->stream[CAPTURE])) < 0){
476 release_dma_lock(flags); 476 release_dma_lock(flags);
477 return -EBUSY; 477 return -EBUSY;
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index 0b09b8b4ec7..f56f870b484 100644
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -1010,7 +1010,7 @@ static int __devinit ad1889_probe(struct pci_dev *pcidev, const struct pci_devic
1010 goto out2; 1010 goto out2;
1011 } 1011 }
1012 1012
1013 if (request_irq(pcidev->irq, ad1889_interrupt, SA_SHIRQ, DEVNAME, dev) != 0) { 1013 if (request_irq(pcidev->irq, ad1889_interrupt, IRQF_SHARED, DEVNAME, dev) != 0) {
1014 printk(KERN_ERR DEVNAME ": unable to request interrupt\n"); 1014 printk(KERN_ERR DEVNAME ": unable to request interrupt\n");
1015 goto out3; 1015 goto out3;
1016 } 1016 }
diff --git a/sound/oss/ali5455.c b/sound/oss/ali5455.c
index 62bb936b1f3..70dcd703a66 100644
--- a/sound/oss/ali5455.c
+++ b/sound/oss/ali5455.c
@@ -3460,7 +3460,7 @@ static int __devinit ali_probe(struct pci_dev *pci_dev,
3460 card->channel[4].num = 4; 3460 card->channel[4].num = 4;
3461 /* claim our iospace and irq */ 3461 /* claim our iospace and irq */
3462 request_region(card->iobase, 256, card_names[pci_id->driver_data]); 3462 request_region(card->iobase, 256, card_names[pci_id->driver_data]);
3463 if (request_irq(card->irq, &ali_interrupt, SA_SHIRQ, 3463 if (request_irq(card->irq, &ali_interrupt, IRQF_SHARED,
3464 card_names[pci_id->driver_data], card)) { 3464 card_names[pci_id->driver_data], card)) {
3465 printk(KERN_ERR "ali_audio: unable to allocate irq %d\n", 3465 printk(KERN_ERR "ali_audio: unable to allocate irq %d\n",
3466 card->irq); 3466 card->irq);
diff --git a/sound/oss/au1000.c b/sound/oss/au1000.c
index eacb0aef21e..e3796231452 100644
--- a/sound/oss/au1000.c
+++ b/sound/oss/au1000.c
@@ -2015,14 +2015,14 @@ static int __devinit au1000_probe(void)
2015 if ((s->dma_dac.dmanr = request_au1000_dma(DMA_ID_AC97C_TX, 2015 if ((s->dma_dac.dmanr = request_au1000_dma(DMA_ID_AC97C_TX,
2016 "audio DAC", 2016 "audio DAC",
2017 dac_dma_interrupt, 2017 dac_dma_interrupt,
2018 SA_INTERRUPT, s)) < 0) { 2018 IRQF_DISABLED, s)) < 0) {
2019 err("Can't get DAC DMA"); 2019 err("Can't get DAC DMA");
2020 goto err_dma1; 2020 goto err_dma1;
2021 } 2021 }
2022 if ((s->dma_adc.dmanr = request_au1000_dma(DMA_ID_AC97C_RX, 2022 if ((s->dma_adc.dmanr = request_au1000_dma(DMA_ID_AC97C_RX,
2023 "audio ADC", 2023 "audio ADC",
2024 adc_dma_interrupt, 2024 adc_dma_interrupt,
2025 SA_INTERRUPT, s)) < 0) { 2025 IRQF_DISABLED, s)) < 0) {
2026 err("Can't get ADC DMA"); 2026 err("Can't get ADC DMA");
2027 goto err_dma2; 2027 goto err_dma2;
2028 } 2028 }
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index bfe3b534ef3..324a81fd3a3 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -966,7 +966,7 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
966 btwrite(~0U, REG_INT_STAT); 966 btwrite(~0U, REG_INT_STAT);
967 pci_set_master(pci_dev); 967 pci_set_master(pci_dev);
968 968
969 if ((rc = request_irq(bta->irq, btaudio_irq, SA_SHIRQ|SA_INTERRUPT, 969 if ((rc = request_irq(bta->irq, btaudio_irq, IRQF_SHARED|IRQF_DISABLED,
970 "btaudio",(void *)bta)) < 0) { 970 "btaudio",(void *)bta)) < 0) {
971 printk(KERN_WARNING 971 printk(KERN_WARNING
972 "btaudio: can't request irq (rc=%d)\n",rc); 972 "btaudio: can't request irq (rc=%d)\n",rc);
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index de60a059ff5..ea51aafaf40 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -3122,7 +3122,7 @@ static int __devinit cm_probe(struct pci_dev *pcidev, const struct pci_device_id
3122 wrmixer(s, DSP_MIX_DATARESETIDX, 0); 3122 wrmixer(s, DSP_MIX_DATARESETIDX, 0);
3123 3123
3124 /* request irq */ 3124 /* request irq */
3125 if ((ret = request_irq(s->irq, cm_interrupt, SA_SHIRQ, "cmpci", s))) { 3125 if ((ret = request_irq(s->irq, cm_interrupt, IRQF_SHARED, "cmpci", s))) {
3126 printk(KERN_ERR "cmpci: irq %u in use\n", s->irq); 3126 printk(KERN_ERR "cmpci: irq %u in use\n", s->irq);
3127 goto err_irq; 3127 goto err_irq;
3128 } 3128 }
diff --git a/sound/oss/cs4281/cs4281m.c b/sound/oss/cs4281/cs4281m.c
index 0004442f9b7..0400a416dc9 100644
--- a/sound/oss/cs4281/cs4281m.c
+++ b/sound/oss/cs4281/cs4281m.c
@@ -4346,7 +4346,7 @@ static int __devinit cs4281_probe(struct pci_dev *pcidev,
4346 s->pcidev = pcidev; 4346 s->pcidev = pcidev;
4347 s->irq = pcidev->irq; 4347 s->irq = pcidev->irq;
4348 if (request_irq 4348 if (request_irq
4349 (s->irq, cs4281_interrupt, SA_SHIRQ, "Crystal CS4281", s)) { 4349 (s->irq, cs4281_interrupt, IRQF_SHARED, "Crystal CS4281", s)) {
4350 CS_DBGOUT(CS_INIT | CS_ERROR, 1, 4350 CS_DBGOUT(CS_INIT | CS_ERROR, 1,
4351 printk(KERN_ERR "cs4281: irq %u in use\n", s->irq)); 4351 printk(KERN_ERR "cs4281: irq %u in use\n", s->irq));
4352 goto err_irq; 4352 goto err_irq;
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index 994c71e986e..5195bf933cb 100644
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -5177,7 +5177,7 @@ static int __devinit cs46xx_probe(struct pci_dev *pci_dev,
5177 card->ba1.name.reg == 0) 5177 card->ba1.name.reg == 0)
5178 goto fail2; 5178 goto fail2;
5179 5179
5180 if (request_irq(card->irq, &cs_interrupt, SA_SHIRQ, "cs46xx", card)) { 5180 if (request_irq(card->irq, &cs_interrupt, IRQF_SHARED, "cs46xx", card)) {
5181 printk(KERN_ERR "cs46xx: unable to allocate irq %d\n", card->irq); 5181 printk(KERN_ERR "cs46xx: unable to allocate irq %d\n", card->irq);
5182 goto fail2; 5182 goto fail2;
5183 } 5183 }
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index 3721c5857b9..c4ce94d6e10 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -1301,7 +1301,7 @@ static int __devinit emu10k1_probe(struct pci_dev *pci_dev, const struct pci_dev
1301 card->pci_dev = pci_dev; 1301 card->pci_dev = pci_dev;
1302 1302
1303 /* Reserve IRQ Line */ 1303 /* Reserve IRQ Line */
1304 if (request_irq(card->irq, emu10k1_interrupt, SA_SHIRQ, card_names[pci_id->driver_data], card)) { 1304 if (request_irq(card->irq, emu10k1_interrupt, IRQF_SHARED, card_names[pci_id->driver_data], card)) {
1305 printk(KERN_ERR "emu10k1: IRQ in use\n"); 1305 printk(KERN_ERR "emu10k1: IRQ in use\n");
1306 ret = -EBUSY; 1306 ret = -EBUSY;
1307 goto err_irq; 1307 goto err_irq;
diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index 094f569cc6e..13f48314973 100644
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -2650,7 +2650,7 @@ static int __devinit es1370_probe(struct pci_dev *pcidev, const struct pci_devic
2650 ret = -EBUSY; 2650 ret = -EBUSY;
2651 goto err_region; 2651 goto err_region;
2652 } 2652 }
2653 if ((ret=request_irq(s->irq, es1370_interrupt, SA_SHIRQ, "es1370",s))) { 2653 if ((ret=request_irq(s->irq, es1370_interrupt, IRQF_SHARED, "es1370",s))) {
2654 printk(KERN_ERR "es1370: irq %u in use\n", s->irq); 2654 printk(KERN_ERR "es1370: irq %u in use\n", s->irq);
2655 goto err_irq; 2655 goto err_irq;
2656 } 2656 }
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 4400c853868..a2ffe723dad 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -2905,7 +2905,7 @@ static int __devinit es1371_probe(struct pci_dev *pcidev, const struct pci_devic
2905 res = -EBUSY; 2905 res = -EBUSY;
2906 goto err_region; 2906 goto err_region;
2907 } 2907 }
2908 if ((res=request_irq(s->irq, es1371_interrupt, SA_SHIRQ, "es1371",s))) { 2908 if ((res=request_irq(s->irq, es1371_interrupt, IRQF_SHARED, "es1371",s))) {
2909 printk(KERN_ERR PFX "irq %u in use\n", s->irq); 2909 printk(KERN_ERR PFX "irq %u in use\n", s->irq);
2910 goto err_irq; 2910 goto err_irq;
2911 } 2911 }
diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index 6861563d752..82f40a0a5c9 100644
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -2392,7 +2392,7 @@ static int __devinit solo1_probe(struct pci_dev *pcidev, const struct pci_device
2392 printk(KERN_ERR "solo1: io ports in use\n"); 2392 printk(KERN_ERR "solo1: io ports in use\n");
2393 goto err_region4; 2393 goto err_region4;
2394 } 2394 }
2395 if ((ret=request_irq(s->irq,solo1_interrupt,SA_SHIRQ,"ESS Solo1",s))) { 2395 if ((ret=request_irq(s->irq,solo1_interrupt,IRQF_SHARED,"ESS Solo1",s))) {
2396 printk(KERN_ERR "solo1: irq %u in use\n", s->irq); 2396 printk(KERN_ERR "solo1: irq %u in use\n", s->irq);
2397 goto err_irq; 2397 goto err_irq;
2398 } 2398 }
diff --git a/sound/oss/forte.c b/sound/oss/forte.c
index 44e578098d7..ea1c0207aef 100644
--- a/sound/oss/forte.c
+++ b/sound/oss/forte.c
@@ -2026,7 +2026,7 @@ forte_probe (struct pci_dev *pci_dev, const struct pci_device_id *pci_id)
2026 chip->iobase = pci_resource_start (pci_dev, 0); 2026 chip->iobase = pci_resource_start (pci_dev, 0);
2027 chip->irq = pci_dev->irq; 2027 chip->irq = pci_dev->irq;
2028 2028
2029 if (request_irq (chip->irq, forte_interrupt, SA_SHIRQ, DRIVER_NAME, 2029 if (request_irq (chip->irq, forte_interrupt, IRQF_SHARED, DRIVER_NAME,
2030 chip)) { 2030 chip)) {
2031 printk (KERN_WARNING PFX "Unable to reserve IRQ"); 2031 printk (KERN_WARNING PFX "Unable to reserve IRQ");
2032 ret = -EIO; 2032 ret = -EIO;
diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c
index dd4f59d30a3..80ab402dae9 100644
--- a/sound/oss/hal2.c
+++ b/sound/oss/hal2.c
@@ -1479,7 +1479,7 @@ static int hal2_init_card(struct hal2_card **phal2, struct hpc3_regs *hpc3)
1479 hpc3->pbus_dmacfg[hal2->dac.pbus.pbusnr][0] = 0x8208844; 1479 hpc3->pbus_dmacfg[hal2->dac.pbus.pbusnr][0] = 0x8208844;
1480 hpc3->pbus_dmacfg[hal2->adc.pbus.pbusnr][0] = 0x8208844; 1480 hpc3->pbus_dmacfg[hal2->adc.pbus.pbusnr][0] = 0x8208844;
1481 1481
1482 if (request_irq(SGI_HPCDMA_IRQ, hal2_interrupt, SA_SHIRQ, 1482 if (request_irq(SGI_HPCDMA_IRQ, hal2_interrupt, IRQF_SHARED,
1483 hal2str, hal2)) { 1483 hal2str, hal2)) {
1484 printk(KERN_ERR "HAL2: Can't get irq %d\n", SGI_HPCDMA_IRQ); 1484 printk(KERN_ERR "HAL2: Can't get irq %d\n", SGI_HPCDMA_IRQ);
1485 ret = -EAGAIN; 1485 ret = -EAGAIN;
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index dd2b871cdac..ddcddc2347f 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -3413,7 +3413,7 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
3413 goto out_iospace; 3413 goto out_iospace;
3414 } 3414 }
3415 3415
3416 if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ, 3416 if (request_irq(card->irq, &i810_interrupt, IRQF_SHARED,
3417 card_names[pci_id->driver_data], card)) { 3417 card_names[pci_id->driver_data], card)) {
3418 printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq); 3418 printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);
3419 goto out_iospace; 3419 goto out_iospace;
diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index 00ac1c95a42..68aab3605d7 100644
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -2019,7 +2019,7 @@ static int __devinit it8172_probe(struct pci_dev *pcidev,
2019 s->io, s->io + pci_resource_len(pcidev,0)-1); 2019 s->io, s->io + pci_resource_len(pcidev,0)-1);
2020 goto err_region; 2020 goto err_region;
2021 } 2021 }
2022 if (request_irq(s->irq, it8172_interrupt, SA_INTERRUPT, 2022 if (request_irq(s->irq, it8172_interrupt, IRQF_DISABLED,
2023 IT8172_MODULE_NAME, s)) { 2023 IT8172_MODULE_NAME, s)) {
2024 err("irq %u in use", s->irq); 2024 err("irq %u in use", s->irq);
2025 goto err_irq; 2025 goto err_irq;
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index e647f2f8627..1d98d100d73 100644
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -3545,7 +3545,7 @@ maestro_probe(struct pci_dev *pcidev,const struct pci_device_id *pdid)
3545 mixer_push_state(card); 3545 mixer_push_state(card);
3546 } 3546 }
3547 3547
3548 if((ret=request_irq(card->irq, ess_interrupt, SA_SHIRQ, card_names[card_type], card))) 3548 if((ret=request_irq(card->irq, ess_interrupt, IRQF_SHARED, card_names[card_type], card)))
3549 { 3549 {
3550 printk(KERN_ERR "maestro: unable to allocate irq %d,\n", card->irq); 3550 printk(KERN_ERR "maestro: unable to allocate irq %d,\n", card->irq);
3551 unregister_sound_mixer(card->dev_mixer); 3551 unregister_sound_mixer(card->dev_mixer);
diff --git a/sound/oss/maestro3.c b/sound/oss/maestro3.c
index 4a5e4237a11..5548e3cff7c 100644
--- a/sound/oss/maestro3.c
+++ b/sound/oss/maestro3.c
@@ -2694,7 +2694,7 @@ static int __devinit m3_probe(struct pci_dev *pci_dev, const struct pci_device_i
2694 } 2694 }
2695 } 2695 }
2696 2696
2697 if(request_irq(card->irq, m3_interrupt, SA_SHIRQ, card_names[card->card_type], card)) { 2697 if(request_irq(card->irq, m3_interrupt, IRQF_SHARED, card_names[card->card_type], card)) {
2698 2698
2699 printk(KERN_ERR PFX "unable to allocate irq %d,\n", card->irq); 2699 printk(KERN_ERR PFX "unable to allocate irq %d,\n", card->irq);
2700 2700
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index 21c1954d910..6f7f2f0423e 100644
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -1909,7 +1909,7 @@ static int __devinit vrc5477_ac97_probe(struct pci_dev *pcidev,
1909 s->io, s->io + pci_resource_len(pcidev,0)-1); 1909 s->io, s->io + pci_resource_len(pcidev,0)-1);
1910 goto err_region; 1910 goto err_region;
1911 } 1911 }
1912 if (request_irq(s->irq, vrc5477_ac97_interrupt, SA_INTERRUPT, 1912 if (request_irq(s->irq, vrc5477_ac97_interrupt, IRQF_DISABLED,
1913 VRC5477_AC97_MODULE_NAME, s)) { 1913 VRC5477_AC97_MODULE_NAME, s)) {
1914 printk(KERN_ERR PFX "irq %u in use\n", s->irq); 1914 printk(KERN_ERR PFX "irq %u in use\n", s->irq);
1915 goto err_irq; 1915 goto err_irq;
diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c
index 6e662ac009a..7760dddf2b3 100644
--- a/sound/oss/nm256_audio.c
+++ b/sound/oss/nm256_audio.c
@@ -733,7 +733,7 @@ static int
733nm256_grabInterrupt (struct nm256_info *card) 733nm256_grabInterrupt (struct nm256_info *card)
734{ 734{
735 if (card->has_irq++ == 0) { 735 if (card->has_irq++ == 0) {
736 if (request_irq (card->irq, card->introutine, SA_SHIRQ, 736 if (request_irq (card->irq, card->introutine, IRQF_SHARED,
737 "NM256_audio", card) < 0) { 737 "NM256_audio", card) < 0) {
738 printk (KERN_ERR "NM256: can't obtain IRQ %d\n", card->irq); 738 printk (KERN_ERR "NM256: can't obtain IRQ %d\n", card->irq);
739 return -1; 739 return -1;
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index a1ec9d131ab..f17d25b6f83 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -994,7 +994,7 @@ static int __devinit rme96xx_probe(struct pci_dev *pcidev, const struct pci_devi
994 994
995 if (pci_enable_device(pcidev)) 995 if (pci_enable_device(pcidev))
996 goto err_irq; 996 goto err_irq;
997 if (request_irq(s->irq, rme96xx_interrupt, SA_SHIRQ, "rme96xx", s)) { 997 if (request_irq(s->irq, rme96xx_interrupt, IRQF_SHARED, "rme96xx", s)) {
998 printk(KERN_ERR RME_MESS" irq %u in use\n", s->irq); 998 printk(KERN_ERR RME_MESS" irq %u in use\n", s->irq);
999 goto err_irq; 999 goto err_irq;
1000 } 1000 }
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 3e8ecac86a8..35bab6e2f99 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -677,7 +677,7 @@ int sb_dsp_init(struct address_info *hw_config, struct module *owner)
677 * will get shared PCI irq lines we must cope. 677 * will get shared PCI irq lines we must cope.
678 */ 678 */
679 679
680 int i=(devc->caps&SB_PCI_IRQ)?SA_SHIRQ:0; 680 int i=(devc->caps&SB_PCI_IRQ)?IRQF_SHARED:0;
681 681
682 if (request_irq(hw_config->irq, sbintr, i, "soundblaster", devc) < 0) 682 if (request_irq(hw_config->irq, sbintr, i, "soundblaster", devc) < 0)
683 { 683 {
diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index cbf745db4b1..7b168d85f4a 100644
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -297,7 +297,7 @@ static int __init dac_audio_init(void)
297 dac_audio_set_rate(); 297 dac_audio_set_rate();
298 298
299 retval = 299 retval =
300 request_irq(TIMER1_IRQ, timer1_interrupt, SA_INTERRUPT, MODNAME, 0); 300 request_irq(TIMER1_IRQ, timer1_interrupt, IRQF_DISABLED, MODNAME, 0);
301 if (retval < 0) { 301 if (retval < 0) {
302 printk(KERN_ERR "sh_dac_audio: IRQ %d request failed\n", 302 printk(KERN_ERR "sh_dac_audio: IRQ %d request failed\n",
303 TIMER1_IRQ); 303 TIMER1_IRQ);
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 42bd276cfc3..8ea532d4019 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -2632,7 +2632,7 @@ static int __devinit sv_probe(struct pci_dev *pcidev, const struct pci_device_id
2632 wrindir(s, SV_CIPCMSR1, ((8000 * 65536 / FULLRATE) >> 8) & 0xff); 2632 wrindir(s, SV_CIPCMSR1, ((8000 * 65536 / FULLRATE) >> 8) & 0xff);
2633 wrindir(s, SV_CIADCOUTPUT, 0); 2633 wrindir(s, SV_CIADCOUTPUT, 0);
2634 /* request irq */ 2634 /* request irq */
2635 if ((ret=request_irq(s->irq,sv_interrupt,SA_SHIRQ,"S3 SonicVibes",s))) { 2635 if ((ret=request_irq(s->irq,sv_interrupt,IRQF_SHARED,"S3 SonicVibes",s))) {
2636 printk(KERN_ERR "sv: irq %u in use\n", s->irq); 2636 printk(KERN_ERR "sv: irq %u in use\n", s->irq);
2637 goto err_irq; 2637 goto err_irq;
2638 } 2638 }
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 420a866fb93..2813e4c8e36 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -4472,7 +4472,7 @@ trident_probe(struct pci_dev *pci_dev, const struct pci_device_id *pci_id)
4472 4472
4473 /* claim our irq */ 4473 /* claim our irq */
4474 rc = -ENODEV; 4474 rc = -ENODEV;
4475 if (request_irq(card->irq, &trident_interrupt, SA_SHIRQ, 4475 if (request_irq(card->irq, &trident_interrupt, IRQF_SHARED,
4476 card_names[pci_id->driver_data], card)) { 4476 card_names[pci_id->driver_data], card)) {
4477 printk(KERN_ERR "trident: unable to allocate irq %d\n", 4477 printk(KERN_ERR "trident: unable to allocate irq %d\n",
4478 card->irq); 4478 card->irq);
diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c
index 3ada26b3fc7..08d8c94d01b 100644
--- a/sound/oss/via82cxxx_audio.c
+++ b/sound/oss/via82cxxx_audio.c
@@ -2013,7 +2013,7 @@ static int via_interrupt_init (struct via_info *card)
2013 tmp8 |= VIA_CR48_FM_TRAP_TO_NMI; 2013 tmp8 |= VIA_CR48_FM_TRAP_TO_NMI;
2014 pci_write_config_byte (card->pdev, VIA_FM_NMI_CTRL, tmp8); 2014 pci_write_config_byte (card->pdev, VIA_FM_NMI_CTRL, tmp8);
2015 } 2015 }
2016 if (request_irq (card->pdev->irq, via_interrupt, SA_SHIRQ, VIA_MODULE_NAME, card)) { 2016 if (request_irq (card->pdev->irq, via_interrupt, IRQF_SHARED, VIA_MODULE_NAME, card)) {
2017 printk (KERN_ERR PFX "unable to obtain IRQ %d, aborting\n", 2017 printk (KERN_ERR PFX "unable to obtain IRQ %d, aborting\n",
2018 card->pdev->irq); 2018 card->pdev->irq);
2019 DPRINTK ("EXIT, returning -EBUSY\n"); 2019 DPRINTK ("EXIT, returning -EBUSY\n");
@@ -2022,7 +2022,7 @@ static int via_interrupt_init (struct via_info *card)
2022 } 2022 }
2023 else 2023 else
2024 { 2024 {
2025 if (request_irq (card->pdev->irq, via_new_interrupt, SA_SHIRQ, VIA_MODULE_NAME, card)) { 2025 if (request_irq (card->pdev->irq, via_new_interrupt, IRQF_SHARED, VIA_MODULE_NAME, card)) {
2026 printk (KERN_ERR PFX "unable to obtain IRQ %d, aborting\n", 2026 printk (KERN_ERR PFX "unable to obtain IRQ %d, aborting\n",
2027 card->pdev->irq); 2027 card->pdev->irq);
2028 DPRINTK ("EXIT, returning -EBUSY\n"); 2028 DPRINTK ("EXIT, returning -EBUSY\n");
diff --git a/sound/oss/wavfront.c b/sound/oss/wavfront.c
index b1a4eeb9dc0..1dec3958cc7 100644
--- a/sound/oss/wavfront.c
+++ b/sound/oss/wavfront.c
@@ -2268,7 +2268,7 @@ static int __init wavefront_hw_reset (void)
2268 } 2268 }
2269 2269
2270 if (request_irq (dev.irq, wavefrontintr, 2270 if (request_irq (dev.irq, wavefrontintr,
2271 SA_INTERRUPT|SA_SHIRQ, 2271 IRQF_DISABLED|IRQF_SHARED,
2272 "wavefront synth", &dev) < 0) { 2272 "wavefront synth", &dev) < 0) {
2273 printk (KERN_WARNING LOGNAME "IRQ %d not available!\n", 2273 printk (KERN_WARNING LOGNAME "IRQ %d not available!\n",
2274 dev.irq); 2274 dev.irq);
diff --git a/sound/oss/wf_midi.c b/sound/oss/wf_midi.c
index 7b167b74375..3f3a390014c 100644
--- a/sound/oss/wf_midi.c
+++ b/sound/oss/wf_midi.c
@@ -820,7 +820,7 @@ int __init install_wf_mpu (void)
820 820
821 /* OK, now we're configured to handle an interrupt ... */ 821 /* OK, now we're configured to handle an interrupt ... */
822 822
823 if (request_irq (phys_dev->irq, wf_mpuintr, SA_INTERRUPT|SA_SHIRQ, 823 if (request_irq (phys_dev->irq, wf_mpuintr, IRQF_DISABLED|IRQF_SHARED,
824 "wavefront midi", phys_dev) < 0) { 824 "wavefront midi", phys_dev) < 0) {
825 825
826 printk (KERN_ERR "WF-MPU: Failed to allocate IRQ%d\n", 826 printk (KERN_ERR "WF-MPU: Failed to allocate IRQ%d\n",
diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index bf90c124a7e..6e22472df95 100644
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -2573,7 +2573,7 @@ static int __devinit ymf_probe_one(struct pci_dev *pcidev, const struct pci_devi
2573 goto out_disable_dsp; 2573 goto out_disable_dsp;
2574 ymf_memload(codec); 2574 ymf_memload(codec);
2575 2575
2576 if (request_irq(pcidev->irq, ymf_interrupt, SA_SHIRQ, "ymfpci", codec) != 0) { 2576 if (request_irq(pcidev->irq, ymf_interrupt, IRQF_SHARED, "ymfpci", codec) != 0) {
2577 printk(KERN_ERR "ymfpci: unable to request IRQ %d\n", 2577 printk(KERN_ERR "ymfpci: unable to request IRQ %d\n",
2578 pcidev->irq); 2578 pcidev->irq);
2579 goto out_memfree; 2579 goto out_memfree;
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index d42bf457036..f7aef8c9cf4 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -947,7 +947,7 @@ snd_ad1889_create(struct snd_card *card,
947 spin_lock_init(&chip->lock); /* only now can we call ad1889_free */ 947 spin_lock_init(&chip->lock); /* only now can we call ad1889_free */
948 948
949 if (request_irq(pci->irq, snd_ad1889_interrupt, 949 if (request_irq(pci->irq, snd_ad1889_interrupt,
950 SA_INTERRUPT|SA_SHIRQ, card->driver, (void*)chip)) { 950 IRQF_DISABLED|IRQF_SHARED, card->driver, (void*)chip)) {
951 printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq); 951 printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
952 snd_ad1889_free(chip); 952 snd_ad1889_free(chip);
953 return -EBUSY; 953 return -EBUSY;
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 5dfdbf6657f..e0a815e53d1 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2185,7 +2185,7 @@ static int __devinit snd_ali_resources(struct snd_ali *codec)
2185 return err; 2185 return err;
2186 codec->port = pci_resource_start(codec->pci, 0); 2186 codec->port = pci_resource_start(codec->pci, 0);
2187 2187
2188 if (request_irq(codec->pci->irq, snd_ali_card_interrupt, SA_INTERRUPT|SA_SHIRQ, "ALI 5451", (void *)codec)) { 2188 if (request_irq(codec->pci->irq, snd_ali_card_interrupt, IRQF_DISABLED|IRQF_SHARED, "ALI 5451", (void *)codec)) {
2189 snd_printk(KERN_ERR "Unable to request irq.\n"); 2189 snd_printk(KERN_ERR "Unable to request irq.\n");
2190 return -EBUSY; 2190 return -EBUSY;
2191 } 2191 }
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 901b08ae917..a9c38963188 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -724,7 +724,7 @@ static int __devinit snd_als300_create(snd_card_t *card,
724 else 724 else
725 irq_handler = snd_als300_interrupt; 725 irq_handler = snd_als300_interrupt;
726 726
727 if (request_irq(pci->irq, irq_handler, SA_INTERRUPT|SA_SHIRQ, 727 if (request_irq(pci->irq, irq_handler, IRQF_DISABLED|IRQF_SHARED,
728 card->shortname, (void *)chip)) { 728 card->shortname, (void *)chip)) {
729 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 729 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
730 snd_als300_free(chip); 730 snd_als300_free(chip);
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index f18a8c0e468..9fbb065a810 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1578,7 +1578,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
1578 return -EIO; 1578 return -EIO;
1579 } 1579 }
1580 1580
1581 if (request_irq(pci->irq, snd_atiixp_interrupt, SA_INTERRUPT|SA_SHIRQ, 1581 if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_DISABLED|IRQF_SHARED,
1582 card->shortname, chip)) { 1582 card->shortname, chip)) {
1583 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1583 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1584 snd_atiixp_free(chip); 1584 snd_atiixp_free(chip);
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index 40739057076..7dcf4941dce 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1251,7 +1251,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
1251 return -EIO; 1251 return -EIO;
1252 } 1252 }
1253 1253
1254 if (request_irq(pci->irq, snd_atiixp_interrupt, SA_INTERRUPT|SA_SHIRQ, 1254 if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_DISABLED|IRQF_SHARED,
1255 card->shortname, chip)) { 1255 card->shortname, chip)) {
1256 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1256 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1257 snd_atiixp_free(chip); 1257 snd_atiixp_free(chip);
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 8a3b118989b..ef189d7f09d 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -197,7 +197,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
197 } 197 }
198 198
199 if ((err = request_irq(pci->irq, vortex_interrupt, 199 if ((err = request_irq(pci->irq, vortex_interrupt,
200 SA_INTERRUPT | SA_SHIRQ, CARD_NAME_SHORT, 200 IRQF_DISABLED | IRQF_SHARED, CARD_NAME_SHORT,
201 chip)) != 0) { 201 chip)) != 0) {
202 printk(KERN_ERR "cannot grab irq\n"); 202 printk(KERN_ERR "cannot grab irq\n");
203 goto irq_out; 203 goto irq_out;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 6e62dafb66c..15447a3216d 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -1724,7 +1724,7 @@ snd_azf3328_create(struct snd_card *card,
1724 chip->synth_port = pci_resource_start(pci, 3); 1724 chip->synth_port = pci_resource_start(pci, 3);
1725 chip->mixer_port = pci_resource_start(pci, 4); 1725 chip->mixer_port = pci_resource_start(pci, 4);
1726 1726
1727 if (request_irq(pci->irq, snd_azf3328_interrupt, SA_INTERRUPT|SA_SHIRQ, card->shortname, (void *)chip)) { 1727 if (request_irq(pci->irq, snd_azf3328_interrupt, IRQF_DISABLED|IRQF_SHARED, card->shortname, (void *)chip)) {
1728 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1728 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1729 err = -EBUSY; 1729 err = -EBUSY;
1730 goto out_err; 1730 goto out_err;
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 497ed6b2006..4d4277d045a 100644
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -747,7 +747,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card,
747 snd_bt87x_writel(chip, REG_INT_MASK, 0); 747 snd_bt87x_writel(chip, REG_INT_MASK, 0);
748 snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS); 748 snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
749 749
750 if (request_irq(pci->irq, snd_bt87x_interrupt, SA_INTERRUPT | SA_SHIRQ, 750 if (request_irq(pci->irq, snd_bt87x_interrupt, IRQF_DISABLED | IRQF_SHARED,
751 "Bt87x audio", chip)) { 751 "Bt87x audio", chip)) {
752 snd_bt87x_free(chip); 752 snd_bt87x_free(chip);
753 snd_printk(KERN_ERR "cannot grab irq\n"); 753 snd_printk(KERN_ERR "cannot grab irq\n");
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 59bf9bd0253..a30c019bab6 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1268,7 +1268,7 @@ static int __devinit snd_ca0106_create(struct snd_card *card,
1268 } 1268 }
1269 1269
1270 if (request_irq(pci->irq, snd_ca0106_interrupt, 1270 if (request_irq(pci->irq, snd_ca0106_interrupt,
1271 SA_INTERRUPT|SA_SHIRQ, "snd_ca0106", 1271 IRQF_DISABLED|IRQF_SHARED, "snd_ca0106",
1272 (void *)chip)) { 1272 (void *)chip)) {
1273 snd_ca0106_free(chip); 1273 snd_ca0106_free(chip);
1274 printk(KERN_ERR "cannot grab irq\n"); 1274 printk(KERN_ERR "cannot grab irq\n");
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 0938c158b5c..03766ad7499 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2862,7 +2862,7 @@ static int __devinit snd_cmipci_create(struct snd_card *card, struct pci_dev *pc
2862 cm->iobase = pci_resource_start(pci, 0); 2862 cm->iobase = pci_resource_start(pci, 0);
2863 2863
2864 if (request_irq(pci->irq, snd_cmipci_interrupt, 2864 if (request_irq(pci->irq, snd_cmipci_interrupt,
2865 SA_INTERRUPT|SA_SHIRQ, card->driver, cm)) { 2865 IRQF_DISABLED|IRQF_SHARED, card->driver, cm)) {
2866 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2866 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2867 snd_cmipci_free(cm); 2867 snd_cmipci_free(cm);
2868 return -EBUSY; 2868 return -EBUSY;
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index e77a4ce314b..d1802487f5b 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1386,7 +1386,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
1386 return -ENOMEM; 1386 return -ENOMEM;
1387 } 1387 }
1388 1388
1389 if (request_irq(pci->irq, snd_cs4281_interrupt, SA_INTERRUPT|SA_SHIRQ, 1389 if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_DISABLED|IRQF_SHARED,
1390 "CS4281", chip)) { 1390 "CS4281", chip)) {
1391 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1391 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1392 snd_cs4281_free(chip); 1392 snd_cs4281_free(chip);
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 5c211443920..894545ea41f 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -3853,7 +3853,7 @@ int __devinit snd_cs46xx_create(struct snd_card *card,
3853 } 3853 }
3854 } 3854 }
3855 3855
3856 if (request_irq(pci->irq, snd_cs46xx_interrupt, SA_INTERRUPT|SA_SHIRQ, 3856 if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_DISABLED|IRQF_SHARED,
3857 "CS46XX", chip)) { 3857 "CS46XX", chip)) {
3858 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 3858 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
3859 snd_cs46xx_free(chip); 3859 snd_cs46xx_free(chip);
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 91c18a11fe8..c12b24c679f 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -321,7 +321,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
321 cs5535au->port = pci_resource_start(pci, 0); 321 cs5535au->port = pci_resource_start(pci, 0);
322 322
323 if (request_irq(pci->irq, snd_cs5535audio_interrupt, 323 if (request_irq(pci->irq, snd_cs5535audio_interrupt,
324 SA_INTERRUPT|SA_SHIRQ, "CS5535 Audio", cs5535au)) { 324 IRQF_DISABLED|IRQF_SHARED, "CS5535 Audio", cs5535au)) {
325 snd_printk("unable to grab IRQ %d\n", pci->irq); 325 snd_printk("unable to grab IRQ %d\n", pci->irq);
326 err = -EBUSY; 326 err = -EBUSY;
327 goto sndfail; 327 goto sndfail;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index 43b408ada1d..27a8dbe6f6a 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1951,7 +1951,7 @@ static __devinit int snd_echo_create(struct snd_card *card,
1951 chip->dsp_registers = (volatile u32 __iomem *) 1951 chip->dsp_registers = (volatile u32 __iomem *)
1952 ioremap_nocache(chip->dsp_registers_phys, sz); 1952 ioremap_nocache(chip->dsp_registers_phys, sz);
1953 1953
1954 if (request_irq(pci->irq, snd_echo_interrupt, SA_INTERRUPT | SA_SHIRQ, 1954 if (request_irq(pci->irq, snd_echo_interrupt, IRQF_DISABLED | IRQF_SHARED,
1955 ECHOCARD_NAME, (void *)chip)) { 1955 ECHOCARD_NAME, (void *)chip)) {
1956 snd_echo_free(chip); 1956 snd_echo_free(chip);
1957 snd_printk(KERN_ERR "cannot grab irq\n"); 1957 snd_printk(KERN_ERR "cannot grab irq\n");
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 42a358f989c..d6f135fe295 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1233,7 +1233,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
1233 } 1233 }
1234 emu->port = pci_resource_start(pci, 0); 1234 emu->port = pci_resource_start(pci, 0);
1235 1235
1236 if (request_irq(pci->irq, snd_emu10k1_interrupt, SA_INTERRUPT|SA_SHIRQ, "EMU10K1", (void *)emu)) { 1236 if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_DISABLED|IRQF_SHARED, "EMU10K1", (void *)emu)) {
1237 err = -EBUSY; 1237 err = -EBUSY;
1238 goto error; 1238 goto error;
1239 } 1239 }
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 0fb27e4be07..2167279429b 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -928,7 +928,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
928 } 928 }
929 929
930 if (request_irq(pci->irq, snd_emu10k1x_interrupt, 930 if (request_irq(pci->irq, snd_emu10k1x_interrupt,
931 SA_INTERRUPT|SA_SHIRQ, "EMU10K1X", 931 IRQF_DISABLED|IRQF_SHARED, "EMU10K1X",
932 (void *)chip)) { 932 (void *)chip)) {
933 snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq); 933 snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
934 snd_emu10k1x_free(chip); 934 snd_emu10k1x_free(chip);
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 9d46bbee2a4..7a985c86800 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2135,7 +2135,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
2135 return err; 2135 return err;
2136 } 2136 }
2137 ensoniq->port = pci_resource_start(pci, 0); 2137 ensoniq->port = pci_resource_start(pci, 0);
2138 if (request_irq(pci->irq, snd_audiopci_interrupt, SA_INTERRUPT|SA_SHIRQ, 2138 if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_DISABLED|IRQF_SHARED,
2139 "Ensoniq AudioPCI", ensoniq)) { 2139 "Ensoniq AudioPCI", ensoniq)) {
2140 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2140 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2141 snd_ensoniq_free(ensoniq); 2141 snd_ensoniq_free(ensoniq);
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index ca6603fe0b1..1113b10259c 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1429,7 +1429,7 @@ static int es1938_resume(struct pci_dev *pci)
1429 pci_restore_state(pci); 1429 pci_restore_state(pci);
1430 pci_enable_device(pci); 1430 pci_enable_device(pci);
1431 request_irq(pci->irq, snd_es1938_interrupt, 1431 request_irq(pci->irq, snd_es1938_interrupt,
1432 SA_INTERRUPT|SA_SHIRQ, "ES1938", chip); 1432 IRQF_DISABLED|IRQF_SHARED, "ES1938", chip);
1433 chip->irq = pci->irq; 1433 chip->irq = pci->irq;
1434 snd_es1938_chip_init(chip); 1434 snd_es1938_chip_init(chip);
1435 1435
@@ -1544,7 +1544,7 @@ static int __devinit snd_es1938_create(struct snd_card *card,
1544 chip->vc_port = pci_resource_start(pci, 2); 1544 chip->vc_port = pci_resource_start(pci, 2);
1545 chip->mpu_port = pci_resource_start(pci, 3); 1545 chip->mpu_port = pci_resource_start(pci, 3);
1546 chip->game_port = pci_resource_start(pci, 4); 1546 chip->game_port = pci_resource_start(pci, 4);
1547 if (request_irq(pci->irq, snd_es1938_interrupt, SA_INTERRUPT|SA_SHIRQ, 1547 if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_DISABLED|IRQF_SHARED,
1548 "ES1938", chip)) { 1548 "ES1938", chip)) {
1549 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1549 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1550 snd_es1938_free(chip); 1550 snd_es1938_free(chip);
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index bfa0876e715..a491c8f8a6a 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2597,7 +2597,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
2597 return err; 2597 return err;
2598 } 2598 }
2599 chip->io_port = pci_resource_start(pci, 0); 2599 chip->io_port = pci_resource_start(pci, 0);
2600 if (request_irq(pci->irq, snd_es1968_interrupt, SA_INTERRUPT|SA_SHIRQ, 2600 if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_DISABLED|IRQF_SHARED,
2601 "ESS Maestro", (void*)chip)) { 2601 "ESS Maestro", (void*)chip)) {
2602 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2602 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2603 snd_es1968_free(chip); 2603 snd_es1968_free(chip);
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 0afa573dd24..3aed27eace2 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1371,7 +1371,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
1371 return err; 1371 return err;
1372 } 1372 }
1373 chip->port = pci_resource_start(pci, 0); 1373 chip->port = pci_resource_start(pci, 0);
1374 if (request_irq(pci->irq, snd_fm801_interrupt, SA_INTERRUPT|SA_SHIRQ, 1374 if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_DISABLED|IRQF_SHARED,
1375 "FM801", chip)) { 1375 "FM801", chip)) {
1376 snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq); 1376 snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
1377 snd_fm801_free(chip); 1377 snd_fm801_free(chip);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 4070b5cd9b6..025af7c0c6e 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1486,7 +1486,7 @@ static int __devinit azx_create(struct snd_card *card, struct pci_dev *pci,
1486 goto errout; 1486 goto errout;
1487 } 1487 }
1488 1488
1489 if (request_irq(pci->irq, azx_interrupt, SA_INTERRUPT|SA_SHIRQ, 1489 if (request_irq(pci->irq, azx_interrupt, IRQF_DISABLED|IRQF_SHARED,
1490 "HDA Intel", (void*)chip)) { 1490 "HDA Intel", (void*)chip)) {
1491 snd_printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq); 1491 snd_printk(KERN_ERR SFX "unable to grab IRQ %d\n", pci->irq);
1492 err = -EBUSY; 1492 err = -EBUSY;
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 845907159b7..89a06dec436 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2606,7 +2606,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
2606 ice->dmapath_port = pci_resource_start(pci, 2); 2606 ice->dmapath_port = pci_resource_start(pci, 2);
2607 ice->profi_port = pci_resource_start(pci, 3); 2607 ice->profi_port = pci_resource_start(pci, 3);
2608 2608
2609 if (request_irq(pci->irq, snd_ice1712_interrupt, SA_INTERRUPT|SA_SHIRQ, 2609 if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_DISABLED|IRQF_SHARED,
2610 "ICE1712", ice)) { 2610 "ICE1712", ice)) {
2611 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2611 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2612 snd_ice1712_free(ice); 2612 snd_ice1712_free(ice);
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 34a58c629f4..ad69ed7c1b8 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2253,7 +2253,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card,
2253 ice->profi_port = pci_resource_start(pci, 1); 2253 ice->profi_port = pci_resource_start(pci, 1);
2254 2254
2255 if (request_irq(pci->irq, snd_vt1724_interrupt, 2255 if (request_irq(pci->irq, snd_vt1724_interrupt,
2256 SA_INTERRUPT|SA_SHIRQ, "ICE1724", ice)) { 2256 IRQF_DISABLED|IRQF_SHARED, "ICE1724", ice)) {
2257 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2257 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2258 snd_vt1724_free(ice); 2258 snd_vt1724_free(ice);
2259 return -EIO; 2259 return -EIO;
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index edc14475ef8..5634bc34925 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2475,7 +2475,7 @@ static int intel8x0_resume(struct pci_dev *pci)
2475 pci_restore_state(pci); 2475 pci_restore_state(pci);
2476 pci_enable_device(pci); 2476 pci_enable_device(pci);
2477 pci_set_master(pci); 2477 pci_set_master(pci);
2478 request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, 2478 request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_DISABLED|IRQF_SHARED,
2479 card->shortname, chip); 2479 card->shortname, chip);
2480 chip->irq = pci->irq; 2480 chip->irq = pci->irq;
2481 synchronize_irq(chip->irq); 2481 synchronize_irq(chip->irq);
@@ -2848,7 +2848,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
2848 2848
2849 /* request irq after initializaing int_sta_mask, etc */ 2849 /* request irq after initializaing int_sta_mask, etc */
2850 if (request_irq(pci->irq, snd_intel8x0_interrupt, 2850 if (request_irq(pci->irq, snd_intel8x0_interrupt,
2851 SA_INTERRUPT|SA_SHIRQ, card->shortname, chip)) { 2851 IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) {
2852 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2852 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2853 snd_intel8x0_free(chip); 2853 snd_intel8x0_free(chip);
2854 return -EBUSY; 2854 return -EBUSY;
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 24703d75b65..f28e273ae27 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1185,7 +1185,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
1185 } 1185 }
1186 1186
1187 port_inited: 1187 port_inited:
1188 if (request_irq(pci->irq, snd_intel8x0_interrupt, SA_INTERRUPT|SA_SHIRQ, 1188 if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_DISABLED|IRQF_SHARED,
1189 card->shortname, chip)) { 1189 card->shortname, chip)) {
1190 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1190 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1191 snd_intel8x0_free(chip); 1191 snd_intel8x0_free(chip);
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index 6e97932de34..2b4ce002794 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2237,7 +2237,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *
2237 } 2237 }
2238 2238
2239 err = request_irq(pci->irq, snd_korg1212_interrupt, 2239 err = request_irq(pci->irq, snd_korg1212_interrupt,
2240 SA_INTERRUPT|SA_SHIRQ, 2240 IRQF_DISABLED|IRQF_SHARED,
2241 "korg1212", korg1212); 2241 "korg1212", korg1212);
2242 2242
2243 if (err) { 2243 if (err) {
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 1c344fbd964..828eab59253 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2760,7 +2760,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
2760 2760
2761 tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip); 2761 tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);
2762 2762
2763 if (request_irq(pci->irq, snd_m3_interrupt, SA_INTERRUPT|SA_SHIRQ, 2763 if (request_irq(pci->irq, snd_m3_interrupt, IRQF_DISABLED|IRQF_SHARED,
2764 card->driver, chip)) { 2764 card->driver, chip)) {
2765 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2765 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2766 snd_m3_free(chip); 2766 snd_m3_free(chip);
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 366c4a7e65c..a4aaa7b9a23 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1319,7 +1319,7 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
1319 pci_resource_len(pci, i)); 1319 pci_resource_len(pci, i));
1320 } 1320 }
1321 1321
1322 if (request_irq(pci->irq, snd_mixart_interrupt, SA_INTERRUPT|SA_SHIRQ, CARD_NAME, (void *)mgr)) { 1322 if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_DISABLED|IRQF_SHARED, CARD_NAME, (void *)mgr)) {
1323 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1323 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1324 snd_mixart_free(mgr); 1324 snd_mixart_free(mgr);
1325 return -EBUSY; 1325 return -EBUSY;
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index b92d6600deb..56d7282e665 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -465,7 +465,7 @@ static int snd_nm256_acquire_irq(struct nm256 *chip)
465{ 465{
466 mutex_lock(&chip->irq_mutex); 466 mutex_lock(&chip->irq_mutex);
467 if (chip->irq < 0) { 467 if (chip->irq < 0) {
468 if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ, 468 if (request_irq(chip->pci->irq, chip->interrupt, IRQF_DISABLED|IRQF_SHARED,
469 chip->card->driver, chip)) { 469 chip->card->driver, chip)) {
470 snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq); 470 snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
471 mutex_unlock(&chip->irq_mutex); 471 mutex_unlock(&chip->irq_mutex);
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 8198884b51e..ae980e11827 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1250,7 +1250,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id
1250 mgr->pci = pci; 1250 mgr->pci = pci;
1251 mgr->irq = -1; 1251 mgr->irq = -1;
1252 1252
1253 if (request_irq(pci->irq, pcxhr_interrupt, SA_INTERRUPT|SA_SHIRQ, 1253 if (request_irq(pci->irq, pcxhr_interrupt, IRQF_DISABLED|IRQF_SHARED,
1254 card_name, mgr)) { 1254 card_name, mgr)) {
1255 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1255 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1256 pcxhr_free(mgr); 1256 pcxhr_free(mgr);
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 5618ec9740b..5501a08ca23 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1892,7 +1892,7 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci,
1892 UNSET_AIE(hwport); 1892 UNSET_AIE(hwport);
1893 1893
1894 if (request_irq 1894 if (request_irq
1895 (pci->irq, snd_riptide_interrupt, SA_INTERRUPT | SA_SHIRQ, 1895 (pci->irq, snd_riptide_interrupt, IRQF_DISABLED | IRQF_SHARED,
1896 "RIPTIDE", chip)) { 1896 "RIPTIDE", chip)) {
1897 snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n", 1897 snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
1898 pci->irq); 1898 pci->irq);
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index 2cb9fe98db2..2e24b68d07a 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1374,7 +1374,7 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
1374 return -ENOMEM; 1374 return -ENOMEM;
1375 } 1375 }
1376 1376
1377 if (request_irq(pci->irq, snd_rme32_interrupt, SA_INTERRUPT | SA_SHIRQ, "RME32", (void *) rme32)) { 1377 if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_DISABLED | IRQF_SHARED, "RME32", (void *) rme32)) {
1378 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1378 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1379 return -EBUSY; 1379 return -EBUSY;
1380 } 1380 }
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 991cb18c14f..fde0f3e2053 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -1588,7 +1588,7 @@ snd_rme96_create(struct rme96 *rme96)
1588 return -ENOMEM; 1588 return -ENOMEM;
1589 } 1589 }
1590 1590
1591 if (request_irq(pci->irq, snd_rme96_interrupt, SA_INTERRUPT|SA_SHIRQ, "RME96", (void *)rme96)) { 1591 if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_DISABLED|IRQF_SHARED, "RME96", (void *)rme96)) {
1592 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1592 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1593 return -EBUSY; 1593 return -EBUSY;
1594 } 1594 }
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index eaf3c22449a..99cf86244ac 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -4912,7 +4912,7 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
4912 return -EBUSY; 4912 return -EBUSY;
4913 } 4913 }
4914 4914
4915 if (request_irq(pci->irq, snd_hdsp_interrupt, SA_INTERRUPT|SA_SHIRQ, "hdsp", (void *)hdsp)) { 4915 if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_DISABLED|IRQF_SHARED, "hdsp", (void *)hdsp)) {
4916 snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq); 4916 snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq);
4917 return -EBUSY; 4917 return -EBUSY;
4918 } 4918 }
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index bba1615504d..7d03ae066d5 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -3497,7 +3497,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
3497 hdspm->port + io_extent - 1); 3497 hdspm->port + io_extent - 1);
3498 3498
3499 if (request_irq(pci->irq, snd_hdspm_interrupt, 3499 if (request_irq(pci->irq, snd_hdspm_interrupt,
3500 SA_INTERRUPT | SA_SHIRQ, "hdspm", 3500 IRQF_DISABLED | IRQF_SHARED, "hdspm",
3501 (void *) hdspm)) { 3501 (void *) hdspm)) {
3502 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq); 3502 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
3503 return -EBUSY; 3503 return -EBUSY;
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 3b945e8c1b1..9534e183413 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -2500,7 +2500,7 @@ static int __devinit snd_rme9652_create(struct snd_card *card,
2500 return -EBUSY; 2500 return -EBUSY;
2501 } 2501 }
2502 2502
2503 if (request_irq(pci->irq, snd_rme9652_interrupt, SA_INTERRUPT|SA_SHIRQ, "rme9652", (void *)rme9652)) { 2503 if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_DISABLED|IRQF_SHARED, "rme9652", (void *)rme9652)) {
2504 snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq); 2504 snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq);
2505 return -EBUSY; 2505 return -EBUSY;
2506 } 2506 }
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index e5511606af0..c4303418668 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1257,7 +1257,7 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
1257 sonic->midi_port = pci_resource_start(pci, 3); 1257 sonic->midi_port = pci_resource_start(pci, 3);
1258 sonic->game_port = pci_resource_start(pci, 4); 1258 sonic->game_port = pci_resource_start(pci, 4);
1259 1259
1260 if (request_irq(pci->irq, snd_sonicvibes_interrupt, SA_INTERRUPT|SA_SHIRQ, "S3 SonicVibes", (void *)sonic)) { 1260 if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_DISABLED|IRQF_SHARED, "S3 SonicVibes", (void *)sonic)) {
1261 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1261 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1262 snd_sonicvibes_free(sonic); 1262 snd_sonicvibes_free(sonic);
1263 return -EBUSY; 1263 return -EBUSY;
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index d99ed723775..4930cc6b054 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3599,7 +3599,7 @@ int __devinit snd_trident_create(struct snd_card *card,
3599 } 3599 }
3600 trident->port = pci_resource_start(pci, 0); 3600 trident->port = pci_resource_start(pci, 0);
3601 3601
3602 if (request_irq(pci->irq, snd_trident_interrupt, SA_INTERRUPT|SA_SHIRQ, 3602 if (request_irq(pci->irq, snd_trident_interrupt, IRQF_DISABLED|IRQF_SHARED,
3603 "Trident Audio", trident)) { 3603 "Trident Audio", trident)) {
3604 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 3604 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
3605 snd_trident_free(trident); 3605 snd_trident_free(trident);
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 2527bbd958c..37bd5eb7a38 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2281,7 +2281,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
2281 if (request_irq(pci->irq, 2281 if (request_irq(pci->irq,
2282 chip_type == TYPE_VIA8233 ? 2282 chip_type == TYPE_VIA8233 ?
2283 snd_via8233_interrupt : snd_via686_interrupt, 2283 snd_via8233_interrupt : snd_via686_interrupt,
2284 SA_INTERRUPT|SA_SHIRQ, 2284 IRQF_DISABLED|IRQF_SHARED,
2285 card->driver, chip)) { 2285 card->driver, chip)) {
2286 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2286 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2287 snd_via82xx_free(chip); 2287 snd_via82xx_free(chip);
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 577a2b03759..c1ede6c2a6d 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -1118,7 +1118,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
1118 return err; 1118 return err;
1119 } 1119 }
1120 chip->port = pci_resource_start(pci, 0); 1120 chip->port = pci_resource_start(pci, 0);
1121 if (request_irq(pci->irq, snd_via82xx_interrupt, SA_INTERRUPT|SA_SHIRQ, 1121 if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_DISABLED|IRQF_SHARED,
1122 card->driver, chip)) { 1122 card->driver, chip)) {
1123 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 1123 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
1124 snd_via82xx_free(chip); 1124 snd_via82xx_free(chip);
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index 0f1ebb010a5..7deda25f7ad 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -162,7 +162,7 @@ static int __devinit snd_vx222_create(struct snd_card *card, struct pci_dev *pci
162 for (i = 0; i < 2; i++) 162 for (i = 0; i < 2; i++)
163 vx->port[i] = pci_resource_start(pci, i + 1); 163 vx->port[i] = pci_resource_start(pci, i + 1);
164 164
165 if (request_irq(pci->irq, snd_vx_irq_handler, SA_INTERRUPT|SA_SHIRQ, 165 if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_DISABLED|IRQF_SHARED,
166 CARD_NAME, (void *) chip)) { 166 CARD_NAME, (void *) chip)) {
167 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 167 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
168 snd_vx222_free(chip); 168 snd_vx222_free(chip);
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index f894752523b..a55b5fd7da6 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2288,7 +2288,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
2288 snd_ymfpci_free(chip); 2288 snd_ymfpci_free(chip);
2289 return -EBUSY; 2289 return -EBUSY;
2290 } 2290 }
2291 if (request_irq(pci->irq, snd_ymfpci_interrupt, SA_INTERRUPT|SA_SHIRQ, "YMFPCI", (void *) chip)) { 2291 if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_DISABLED|IRQF_SHARED, "YMFPCI", (void *) chip)) {
2292 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); 2292 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
2293 snd_ymfpci_free(chip); 2293 snd_ymfpci_free(chip);
2294 return -EBUSY; 2294 return -EBUSY;
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index ba1b2a3443d..db3e22efd02 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -973,7 +973,7 @@ static int __init snd_amd7930_create(struct snd_card *card,
973 amd7930_idle(amd); 973 amd7930_idle(amd);
974 974
975 if (request_irq(irq, snd_amd7930_interrupt, 975 if (request_irq(irq, snd_amd7930_interrupt,
976 SA_INTERRUPT | SA_SHIRQ, "amd7930", amd)) { 976 IRQF_DISABLED | IRQF_SHARED, "amd7930", amd)) {
977 snd_printk("amd7930-%d: Unable to grab IRQ %d\n", 977 snd_printk("amd7930-%d: Unable to grab IRQ %d\n",
978 dev, irq); 978 dev, irq);
979 snd_amd7930_free(amd); 979 snd_amd7930_free(amd);
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 44ad9616bf6..5018fcf41df 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2001,7 +2001,7 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
2001 chip->c_dma.preallocate = sbus_dma_preallocate; 2001 chip->c_dma.preallocate = sbus_dma_preallocate;
2002 2002
2003 if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt, 2003 if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
2004 SA_SHIRQ, "cs4231", chip)) { 2004 IRQF_SHARED, "cs4231", chip)) {
2005 snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n", 2005 snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
2006 dev, sdev->irqs[0]); 2006 dev, sdev->irqs[0]);
2007 snd_cs4231_sbus_free(chip); 2007 snd_cs4231_sbus_free(chip);
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 63bef0aadf1..59a02a0d9af 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2569,7 +2569,7 @@ static int __init snd_dbri_create(struct snd_card *card,
2569 return -EIO; 2569 return -EIO;
2570 } 2570 }
2571 2571
2572 err = request_irq(dbri->irq, snd_dbri_interrupt, SA_SHIRQ, 2572 err = request_irq(dbri->irq, snd_dbri_interrupt, IRQF_SHARED,
2573 "DBRI audio", dbri); 2573 "DBRI audio", dbri);
2574 if (err) { 2574 if (err) {
2575 printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq); 2575 printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);