aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/ad1816a/ad1816a_lib.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/gusmax.c2
-rw-r--r--sound/isa/gus/interwave.c2
-rw-r--r--sound/isa/opl3sa2.c2
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c2
-rw-r--r--sound/isa/sb/sb_common.c2
-rw-r--r--sound/isa/wavefront/wavefront.c2
-rw-r--r--sound/isa/wss/wss_lib.c2
11 files changed, 11 insertions, 11 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index 05aef8b97e96..177eed3271bc 100644
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -595,7 +595,7 @@ int __devinit snd_ad1816a_create(struct snd_card *card,
595 snd_ad1816a_free(chip); 595 snd_ad1816a_free(chip);
596 return -EBUSY; 596 return -EBUSY;
597 } 597 }
598 if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) { 598 if (request_irq(irq, snd_ad1816a_interrupt, 0, "AD1816A", (void *) chip)) {
599 snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq); 599 snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
600 snd_ad1816a_free(chip); 600 snd_ad1816a_free(chip);
601 return -EBUSY; 601 return -EBUSY;
diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index 07676200496a..d3eab6fb0866 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -661,7 +661,7 @@ int snd_es1688_create(struct snd_card *card,
661 snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4); 661 snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);
662 return -EBUSY; 662 return -EBUSY;
663 } 663 }
664 if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) { 664 if (request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip)) {
665 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq); 665 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
666 return -EBUSY; 666 return -EBUSY;
667 } 667 }
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index aeee8f8bf5e9..bf6ad0bf51c6 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1805,7 +1805,7 @@ static int __devinit snd_es18xx_new_device(struct snd_card *card,
1805 return -EBUSY; 1805 return -EBUSY;
1806 } 1806 }
1807 1807
1808 if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx", 1808 if (request_irq(irq, snd_es18xx_interrupt, 0, "ES18xx",
1809 (void *) card)) { 1809 (void *) card)) {
1810 snd_es18xx_free(card); 1810 snd_es18xx_free(card);
1811 snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq); 1811 snd_printk(KERN_ERR PFX "unable to grap IRQ %d\n", irq);
diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c
index 12eb98f2f931..3167e5ac3699 100644
--- a/sound/isa/gus/gus_main.c
+++ b/sound/isa/gus/gus_main.c
@@ -180,7 +180,7 @@ int snd_gus_create(struct snd_card *card,
180 snd_gus_free(gus); 180 snd_gus_free(gus);
181 return -EBUSY; 181 return -EBUSY;
182 } 182 }
183 if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) { 183 if (irq >= 0 && request_irq(irq, snd_gus_interrupt, 0, "GUS GF1", (void *) gus)) {
184 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq); 184 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
185 snd_gus_free(gus); 185 snd_gus_free(gus);
186 return -EBUSY; 186 return -EBUSY;
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c
index 3e4a58b72913..c43faa057ff6 100644
--- a/sound/isa/gus/gusmax.c
+++ b/sound/isa/gus/gusmax.c
@@ -291,7 +291,7 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
291 goto _err; 291 goto _err;
292 } 292 }
293 293
294 if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) { 294 if (request_irq(xirq, snd_gusmax_interrupt, 0, "GUS MAX", (void *)maxcard)) {
295 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); 295 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
296 err = -EBUSY; 296 err = -EBUSY;
297 goto _err; 297 goto _err;
diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
index c7b80e4730fc..5f869a32b48c 100644
--- a/sound/isa/gus/interwave.c
+++ b/sound/isa/gus/interwave.c
@@ -684,7 +684,7 @@ static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
684 if ((err = snd_gus_initialize(gus)) < 0) 684 if ((err = snd_gus_initialize(gus)) < 0)
685 return err; 685 return err;
686 686
687 if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED, 687 if (request_irq(xirq, snd_interwave_interrupt, 0,
688 "InterWave", iwcard)) { 688 "InterWave", iwcard)) {
689 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq); 689 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
690 return -EBUSY; 690 return -EBUSY;
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index de99f47770bf..bbafb0b543ea 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -667,7 +667,7 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
667 err = snd_opl3sa2_detect(card); 667 err = snd_opl3sa2_detect(card);
668 if (err < 0) 668 if (err < 0)
669 return err; 669 return err;
670 err = request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED, 670 err = request_irq(xirq, snd_opl3sa2_interrupt, 0,
671 "OPL3-SA2", card); 671 "OPL3-SA2", card);
672 if (err) { 672 if (err) {
673 snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq); 673 snd_printk(KERN_ERR PFX "can't grab IRQ %d\n", xirq);
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index 346e12baa98e..6dbbfa76b440 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -892,7 +892,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
892#endif 892#endif
893#ifdef OPTi93X 893#ifdef OPTi93X
894 error = request_irq(irq, snd_opti93x_interrupt, 894 error = request_irq(irq, snd_opti93x_interrupt,
895 IRQF_DISABLED, DEV_NAME" - WSS", chip); 895 0, DEV_NAME" - WSS", chip);
896 if (error < 0) { 896 if (error < 0) {
897 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq); 897 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq);
898 return error; 898 return error;
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index eae6c1c0eff9..d2e19215813e 100644
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -240,7 +240,7 @@ int snd_sbdsp_create(struct snd_card *card,
240 if (request_irq(irq, irq_handler, 240 if (request_irq(irq, irq_handler,
241 (hardware == SB_HW_ALS4000 || 241 (hardware == SB_HW_ALS4000 ||
242 hardware == SB_HW_CS5530) ? 242 hardware == SB_HW_CS5530) ?
243 IRQF_SHARED : IRQF_DISABLED, 243 IRQF_SHARED : 0,
244 "SoundBlaster", (void *) chip)) { 244 "SoundBlaster", (void *) chip)) {
245 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq); 245 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
246 snd_sbdsp_free(chip); 246 snd_sbdsp_free(chip);
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 83f291d89a95..87142977335a 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -418,7 +418,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
418 return -EBUSY; 418 return -EBUSY;
419 } 419 }
420 if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt, 420 if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
421 IRQF_DISABLED, "ICS2115", acard)) { 421 0, "ICS2115", acard)) {
422 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]); 422 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
423 return -EBUSY; 423 return -EBUSY;
424 } 424 }
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 2a42cc377957..7277c5b7df6c 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1833,7 +1833,7 @@ int snd_wss_create(struct snd_card *card,
1833 } 1833 }
1834 chip->cport = cport; 1834 chip->cport = cport;
1835 if (!(hwshare & WSS_HWSHARE_IRQ)) 1835 if (!(hwshare & WSS_HWSHARE_IRQ))
1836 if (request_irq(irq, snd_wss_interrupt, IRQF_DISABLED, 1836 if (request_irq(irq, snd_wss_interrupt, 0,
1837 "WSS", (void *) chip)) { 1837 "WSS", (void *) chip)) {
1838 snd_printk(KERN_ERR "wss: can't grab IRQ %d\n", irq); 1838 snd_printk(KERN_ERR "wss: can't grab IRQ %d\n", irq);
1839 snd_wss_free(chip); 1839 snd_wss_free(chip);