44 files changed, 78 insertions, 71 deletions

diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 077fbe25ebf4..ccd0a953953d 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -927,7 +927,7 @@
           <informalexample>
             <programlisting>
 <![CDATA[
-  struct mychip *chip = (struct mychip *)card->private_data;
+  struct mychip *chip = card->private_data;
 ]]>
             </programlisting>
           </informalexample>
@@ -1095,7 +1095,7 @@
 
           /* release the irq */
           if (chip->irq >= 0)
-                  free_irq(chip->irq, (void *)chip);
+                  free_irq(chip->irq, chip);
           /* release the i/o ports & memory */
           pci_release_regions(chip->pci);
           /* disable the PCI entry */
@@ -1148,7 +1148,7 @@
           }
           chip->port = pci_resource_start(pci, 0);
           if (request_irq(pci->irq, snd_mychip_interrupt,
-                          IRQF_DISABLED|IRQF_SHARED, "My Chip", chip)) {
+                          IRQF_SHARED, "My Chip", chip)) {
                   printk(KERN_ERR "cannot grab irq %d\n", pci->irq);
                   snd_mychip_free(chip);
                   return -EBUSY;
@@ -1387,7 +1387,7 @@
           <programlisting>
 <![CDATA[
   if (chip->irq >= 0)
-          free_irq(chip->irq, (void *)chip);
+          free_irq(chip->irq, chip);
 ]]>
           </programlisting>
         </informalexample>
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index c62a9e3d2ae4..3094f3852167 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 ?
-                        IRQF_DISABLED | IRQF_SHARED : 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/pci/ad1889.c b/sound/pci/ad1889.c
index cbf8331c3d33..98970d401be9 100644
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -858,7 +858,7 @@ snd_ad1889_free(struct snd_ad1889 *chip)
         synchronize_irq(chip->irq);
         
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void*)chip);
+                free_irq(chip->irq, chip);
 
 skip_hw:
         if (chip->iobase)
@@ -945,7 +945,7 @@ snd_ad1889_create(struct snd_card *card,
         spin_lock_init(&chip->lock);    /* only now can we call ad1889_free */
 
         if (request_irq(pci->irq, snd_ad1889_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, card->driver, (void*)chip)) {
+                        IRQF_SHARED, card->driver, chip)) {
                 printk(KERN_ERR PFX "cannot obtain IRQ %d\n", pci->irq);
                 snd_ad1889_free(chip);
                 return -EBUSY;
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index a7edd56542d4..9327ab2eccb0 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2095,7 +2095,7 @@ static int snd_ali_free(struct snd_ali * codec)
                 snd_ali_disable_address_interrupt(codec);
         if (codec->irq >= 0) {
                 synchronize_irq(codec->irq);
-                free_irq(codec->irq, (void *)codec);
+                free_irq(codec->irq, codec);
         }
         if (codec->port)
                 pci_release_regions(codec->pci);
@@ -2192,7 +2192,8 @@ static int __devinit snd_ali_resources(struct snd_ali *codec)
                 return err;
         codec->port = pci_resource_start(codec->pci, 0);
 
-        if (request_irq(codec->pci->irq, snd_ali_card_interrupt, IRQF_DISABLED|IRQF_SHARED, "ALI 5451", (void *)codec)) {
+        if (request_irq(codec->pci->irq, snd_ali_card_interrupt,
+                        IRQF_SHARED, "ALI 5451", codec)) {
                 snd_printk(KERN_ERR "Unable to request irq.\n");
                 return -EBUSY;
         }
diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 95f70f3cc37e..9f406fbe0d95 100644
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -190,7 +190,7 @@ static int snd_als300_free(struct snd_als300 *chip)
         snd_als300_dbgcallenter();
         snd_als300_set_irq_flag(chip, IRQ_DISABLE);
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
         kfree(chip);
@@ -722,8 +722,8 @@ static int __devinit snd_als300_create(snd_card_t *card,
         else
                 irq_handler = snd_als300_interrupt;
 
-        if (request_irq(pci->irq, irq_handler, IRQF_DISABLED|IRQF_SHARED,
-                                        card->shortname, (void *)chip)) {
+        if (request_irq(pci->irq, irq_handler, IRQF_SHARED,
+                        card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_als300_free(chip);
                 return -EBUSY;
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index e3e99f396711..476c3433073e 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -1583,7 +1583,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                 return -EIO;
         }
 
-        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
                         card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_atiixp_free(chip);
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index dc54f2c68ed7..cc2e6b9d407e 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -1256,7 +1256,7 @@ static int __devinit snd_atiixp_create(struct snd_card *card,
                 return -EIO;
         }
 
-        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_atiixp_interrupt, IRQF_SHARED,
                         card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_atiixp_free(chip);
diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 6ed5ad59f5b5..238154bb7a25 100644
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -198,7 +198,7 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
         }
 
         if ((err = request_irq(pci->irq, vortex_interrupt,
-                               IRQF_DISABLED | IRQF_SHARED, CARD_NAME_SHORT,
+                               IRQF_SHARED, CARD_NAME_SHORT,
                                chip)) != 0) {
                 printk(KERN_ERR "cannot grab irq\n");
                 goto irq_out;
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 2414ee630756..43edd2839b5a 100644
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -1513,7 +1513,7 @@ snd_azf3328_free(struct snd_azf3328 *chip)
 __end_hw:
         snd_azf3328_free_joystick(chip);
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
         pci_release_regions(chip->pci);
         pci_disable_device(chip->pci);
 
@@ -1724,7 +1724,8 @@ snd_azf3328_create(struct snd_card *card,
         chip->synth_port = pci_resource_start(pci, 3);
         chip->mixer_port = pci_resource_start(pci, 4);
 
-        if (request_irq(pci->irq, snd_azf3328_interrupt, IRQF_DISABLED|IRQF_SHARED, card->shortname, (void *)chip)) {
+        if (request_irq(pci->irq, snd_azf3328_interrupt,
+                        IRQF_SHARED, card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 err = -EBUSY;
                 goto out_err;
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 05e009184bfb..c3f3da211234 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,
         snd_bt87x_writel(chip, REG_INT_MASK, 0);
         snd_bt87x_writel(chip, REG_INT_STAT, MY_INTERRUPTS);
 
-        if (request_irq(pci->irq, snd_bt87x_interrupt, IRQF_DISABLED | IRQF_SHARED,
+        if (request_irq(pci->irq, snd_bt87x_interrupt, IRQF_SHARED,
                         "Bt87x audio", chip)) {
                 snd_bt87x_free(chip);
                 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 2adbd003851d..35ac187cab66 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1046,7 +1046,7 @@ static int snd_ca0106_free(struct snd_ca0106 *chip)
 
         // release the irq
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
         pci_disable_device(chip->pci);
         kfree(chip);
         return 0;
@@ -1267,8 +1267,7 @@ static int __devinit snd_ca0106_create(struct snd_card *card,
         }
 
         if (request_irq(pci->irq, snd_ca0106_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, "snd_ca0106",
-                        (void *)chip)) {
+                        IRQF_SHARED, "snd_ca0106", chip)) {
                 snd_ca0106_free(chip);
                 printk(KERN_ERR "cannot grab irq\n");
                 return -EBUSY;
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 0093cd1f92db..71c58df4af28 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
         cm->iobase = pci_resource_start(pci, 0);
 
         if (request_irq(pci->irq, snd_cmipci_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, card->driver, cm)) {
+                        IRQF_SHARED, card->driver, cm)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_cmipci_free(cm);
                 return -EBUSY;
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index 0905fa88129d..8e5519de7115 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -1391,7 +1391,7 @@ static int __devinit snd_cs4281_create(struct snd_card *card,
                 return -ENOMEM;
         }
         
-        if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_cs4281_interrupt, IRQF_SHARED,
                         "CS4281", chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_cs4281_free(chip);
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 2807b9756ef0..2ae539b195fd 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -3867,7 +3867,7 @@ int __devinit snd_cs46xx_create(struct snd_card *card,
                 }
         }
 
-        if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_cs46xx_interrupt, IRQF_SHARED,
                         "CS46XX", chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_cs46xx_free(chip);
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 2441238f2004..b8e75ef9c1e6 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -320,7 +320,7 @@ static int __devinit snd_cs5535audio_create(struct snd_card *card,
         cs5535au->port = pci_resource_start(pci, 0);
 
         if (request_irq(pci->irq, snd_cs5535audio_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, "CS5535 Audio", cs5535au)) {
+                        IRQF_SHARED, "CS5535 Audio", cs5535au)) {
                 snd_printk("unable to grab IRQ %d\n", pci->irq);
                 err = -EBUSY;
                 goto sndfail;
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c
index e5e88fe54de0..047e0b5bf15d 100644
--- a/sound/pci/echoaudio/echoaudio.c
+++ b/sound/pci/echoaudio/echoaudio.c
@@ -1872,7 +1872,7 @@ static int snd_echo_free(struct echoaudio *chip)
         DE_INIT(("Stopped.\n"));
 
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
 
         if (chip->dsp_registers)
                 iounmap(chip->dsp_registers);
@@ -1950,8 +1950,8 @@ static __devinit int snd_echo_create(struct snd_card *card,
         chip->dsp_registers = (volatile u32 __iomem *)
                 ioremap_nocache(chip->dsp_registers_phys, sz);
 
-        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_DISABLED | IRQF_SHARED,
-                                                ECHOCARD_NAME, (void *)chip)) {
+        if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED,
+                        ECHOCARD_NAME, chip)) {
                 snd_echo_free(chip);
                 snd_printk(KERN_ERR "cannot grab irq\n");
                 return -EBUSY;
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 8bc4ffa6220d..972ec40d8166 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -759,7 +759,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu)
         free_pm_buffer(emu);
 #endif
         if (emu->irq >= 0)
-                free_irq(emu->irq, (void *)emu);
+                free_irq(emu->irq, emu);
         if (emu->port)
                 pci_release_regions(emu->pci);
         if (emu->card_capabilities->ca0151_chip) /* P16V */     
@@ -1246,7 +1246,8 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
         }
         emu->port = pci_resource_start(pci, 0);
 
-        if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_DISABLED|IRQF_SHARED, "EMU10K1", (void *)emu)) {
+        if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
+                        "EMU10K1", emu)) {
                 err = -EBUSY;
                 goto error;
         }
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index e0724394ed25..2199b42a6019 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -760,7 +760,7 @@ static int snd_emu10k1x_free(struct emu10k1x *chip)
 
         // release the irq
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
 
         // release the DMA
         if (chip->dma_buffer.area) {
@@ -927,8 +927,7 @@ static int __devinit snd_emu10k1x_create(struct snd_card *card,
         }
 
         if (request_irq(pci->irq, snd_emu10k1x_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, "EMU10K1X",
-                        (void *)chip)) {
+                        IRQF_SHARED, "EMU10K1X", chip)) {
                 snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
                 snd_emu10k1x_free(chip);
                 return -EBUSY;
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index d2a811f222c9..a84f6b21024f 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -2141,7 +2141,7 @@ static int __devinit snd_ensoniq_create(struct snd_card *card,
                 return err;
         }
         ensoniq->port = pci_resource_start(pci, 0);
-        if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_audiopci_interrupt, IRQF_SHARED,
                         "Ensoniq AudioPCI", ensoniq)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ensoniq_free(ensoniq);
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index 1a8d36df4b5d..66ac26c5a240 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1508,7 +1508,7 @@ static int es1938_resume(struct pci_dev *pci)
         }
 
         if (request_irq(pci->irq, snd_es1938_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, "ES1938", chip)) {
+                        IRQF_SHARED, "ES1938", chip)) {
                 printk(KERN_ERR "es1938: unable to grab IRQ %d, "
                        "disabling device\n", pci->irq);
                 snd_card_disconnect(card);
@@ -1631,7 +1631,7 @@ static int __devinit snd_es1938_create(struct snd_card *card,
         chip->vc_port = pci_resource_start(pci, 2);
         chip->mpu_port = pci_resource_start(pci, 3);
         chip->game_port = pci_resource_start(pci, 4);
-        if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_es1938_interrupt, IRQF_SHARED,
                         "ES1938", chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_es1938_free(chip);
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 01c521d1b460..dc84c189b05f 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2462,7 +2462,7 @@ static int snd_es1968_free(struct es1968 *chip)
         }
 
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
         snd_es1968_free_gameport(chip);
         chip->master_switch = NULL;
         chip->master_volume = NULL;
@@ -2552,8 +2552,8 @@ static int __devinit snd_es1968_create(struct snd_card *card,
                 return err;
         }
         chip->io_port = pci_resource_start(pci, 0);
-        if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_DISABLED|IRQF_SHARED,
-                        "ESS Maestro", (void*)chip)) {
+        if (request_irq(pci->irq, snd_es1968_interrupt, IRQF_SHARED,
+                        "ESS Maestro", chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_es1968_free(chip);
                 return -EBUSY;
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 77e3d5c18302..b7b361ce3a93 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1395,7 +1395,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
         }
         chip->port = pci_resource_start(pci, 0);
         if ((tea575x_tuner & 0x0010) == 0) {
-                if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_DISABLED|IRQF_SHARED,
+                if (request_irq(pci->irq, snd_fm801_interrupt, IRQF_SHARED,
                                 "FM801", chip)) {
                         snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->irq);
                         snd_fm801_free(chip);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e35cfd326df2..9fd34f85cad5 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1380,7 +1380,8 @@ static int __devinit azx_init_stream(struct azx *chip)
 
 static int azx_acquire_irq(struct azx *chip, int do_disconnect)
 {
-        if (request_irq(chip->pci->irq, azx_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(chip->pci->irq, azx_interrupt,
+                        chip->msi ? 0 : IRQF_SHARED,
                         "HDA Intel", chip)) {
                 printk(KERN_ERR "hda-intel: unable to grab IRQ %d, "
                        "disabling device\n", chip->pci->irq);
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 8a576b78bee5..8ba31cfb9045 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2614,7 +2614,7 @@ static int __devinit snd_ice1712_create(struct snd_card *card,
         ice->dmapath_port = pci_resource_start(pci, 2);
         ice->profi_port = pci_resource_start(pci, 3);
 
-        if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_ice1712_interrupt, IRQF_SHARED,
                         "ICE1712", ice)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ice1712_free(ice);
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index e9cbfdf37059..3e3a102e6c34 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,
         ice->profi_port = pci_resource_start(pci, 1);
 
         if (request_irq(pci->irq, snd_vt1724_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, "ICE1724", ice)) {
+                        IRQF_SHARED, "ICE1724", ice)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_vt1724_free(ice);
                 return -EIO;
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 9c1bce7afa86..30aaa6092a84 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -2509,7 +2509,7 @@ static int intel8x0_resume(struct pci_dev *pci)
         }
         pci_set_master(pci);
         if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) {
+                        IRQF_SHARED, card->shortname, chip)) {
                 printk(KERN_ERR "intel8x0: unable to grab IRQ %d, "
                        "disabling device\n", pci->irq);
                 snd_card_disconnect(card);
@@ -2887,7 +2887,7 @@ static int __devinit snd_intel8x0_create(struct snd_card *card,
 
         /* request irq after initializaing int_sta_mask, etc */
         if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) {
+                        IRQF_SHARED, card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_intel8x0_free(chip);
                 return -EBUSY;
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index bd467c501123..09dcf923b547 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -1071,7 +1071,7 @@ static int intel8x0m_resume(struct pci_dev *pci)
         }
         pci_set_master(pci);
         if (request_irq(pci->irq, snd_intel8x0_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED, card->shortname, chip)) {
+                        IRQF_SHARED, card->shortname, chip)) {
                 printk(KERN_ERR "intel8x0m: unable to grab IRQ %d, "
                        "disabling device\n", pci->irq);
                 snd_card_disconnect(card);
@@ -1205,7 +1205,7 @@ static int __devinit snd_intel8x0m_create(struct snd_card *card,
         }
 
  port_inited:
-        if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_intel8x0_interrupt, IRQF_SHARED,
                         card->shortname, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_intel8x0_free(chip);
diff --git a/sound/pci/korg1212/korg1212.c b/sound/pci/korg1212/korg1212.c
index fa8cd8cecc21..345eefeedb39 100644
--- a/sound/pci/korg1212/korg1212.c
+++ b/sound/pci/korg1212/korg1212.c
@@ -2233,7 +2233,7 @@ static int __devinit snd_korg1212_create(struct snd_card *card, struct pci_dev *
         }
 
         err = request_irq(pci->irq, snd_korg1212_interrupt,
-                          IRQF_DISABLED|IRQF_SHARED,
+                          IRQF_SHARED,
                           "korg1212", korg1212);
 
         if (err) {
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 563c9ec49830..6efe6d5ade1e 100644
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2762,7 +2762,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
 
         tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);
 
-        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_m3_interrupt, IRQF_SHARED,
                         card->driver, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_m3_free(chip);
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 216aee5f93e7..21386da3bc86 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1066,7 +1066,7 @@ static int snd_mixart_free(struct mixart_mgr *mgr)
 
         /* release irq  */
         if (mgr->irq >= 0)
-                free_irq(mgr->irq, (void *)mgr);
+                free_irq(mgr->irq, mgr);
 
         /* reset board if some firmware was loaded */
         if(mgr->dsp_loaded) {
@@ -1319,7 +1319,8 @@ static int __devinit snd_mixart_probe(struct pci_dev *pci,
                                                    pci_resource_len(pci, i));
         }
 
-        if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_DISABLED|IRQF_SHARED, CARD_NAME, (void *)mgr)) {
+        if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED,
+                        CARD_NAME, mgr)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_mixart_free(mgr);
                 return -EBUSY;
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 945d21bf187e..879e31a9f9c6 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)
 {
         mutex_lock(&chip->irq_mutex);
         if (chip->irq < 0) {
-                if (request_irq(chip->pci->irq, chip->interrupt, IRQF_DISABLED|IRQF_SHARED,
+                if (request_irq(chip->pci->irq, chip->interrupt, IRQF_SHARED,
                                 chip->card->driver, chip)) {
                         snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
                         mutex_unlock(&chip->irq_mutex);
diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 533c672ae8f3..d97413484ae9 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
         mgr->pci = pci;
         mgr->irq = -1;
 
-        if (request_irq(pci->irq, pcxhr_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED,
                         card_name, mgr)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 pcxhr_free(mgr);
diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 56e0c01123e7..5e1d5d2b2850 100644
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1899,9 +1899,8 @@ snd_riptide_create(struct snd_card *card, struct pci_dev *pci,
         hwport = (struct riptideport *)chip->port;
         UNSET_AIE(hwport);
 
-        if (request_irq
-            (pci->irq, snd_riptide_interrupt, IRQF_DISABLED | IRQF_SHARED,
-             "RIPTIDE", chip)) {
+        if (request_irq(pci->irq, snd_riptide_interrupt, IRQF_SHARED,
+                        "RIPTIDE", chip)) {
                 snd_printk(KERN_ERR "Riptide: unable to grab IRQ %d\n",
                            pci->irq);
                 snd_riptide_free(chip);
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index dc8d1302e22d..6bb7ac650ec4 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -1373,7 +1373,8 @@ static int __devinit snd_rme32_create(struct rme32 * rme32)
                 return -ENOMEM;
         }
 
-        if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_DISABLED | IRQF_SHARED, "RME32", (void *) rme32)) {
+        if (request_irq(pci->irq, snd_rme32_interrupt, IRQF_SHARED,
+                        "RME32", rme32)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 106110a89a4c..e3304b7ccbcb 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -1587,7 +1587,8 @@ snd_rme96_create(struct rme96 *rme96)
                 return -ENOMEM;
         }
 
-        if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_DISABLED|IRQF_SHARED, "RME96", (void *)rme96)) {
+        if (request_irq(pci->irq, snd_rme96_interrupt, IRQF_SHARED,
+                        "RME96", rme96)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index af2e59e5edf2..6383987b460e 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -4934,7 +4934,8 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
                 return -EBUSY;
         }
 
-        if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_DISABLED|IRQF_SHARED, "hdsp", (void *)hdsp)) {
+        if (request_irq(pci->irq, snd_hdsp_interrupt, IRQF_SHARED,
+                        "hdsp", hdsp)) {
                 snd_printk(KERN_ERR "Hammerfall-DSP: unable to use IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 7055d893855d..0547f6f04bdc 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -3496,8 +3496,7 @@ static int __devinit snd_hdspm_create(struct snd_card *card, struct hdspm * hdsp
                    hdspm->port + io_extent - 1);
 
         if (request_irq(pci->irq, snd_hdspm_interrupt,
-                        IRQF_DISABLED | IRQF_SHARED, "hdspm",
-                        (void *) hdspm)) {
+                        IRQF_SHARED, "hdspm", hdspm)) {
                 snd_printk(KERN_ERR "HDSPM: unable to use IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index dadd588dccc6..cc3bdececce7 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -2500,7 +2500,8 @@ static int __devinit snd_rme9652_create(struct snd_card *card,
                 return -EBUSY;
         }
         
-        if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_DISABLED|IRQF_SHARED, "rme9652", (void *)rme9652)) {
+        if (request_irq(pci->irq, snd_rme9652_interrupt, IRQF_SHARED,
+                        "rme9652", rme9652)) {
                 snd_printk(KERN_ERR "unable to request IRQ %d\n", pci->irq);
                 return -EBUSY;
         }
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index f9b8afabda9c..9f25d93cbec2 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1195,7 +1195,7 @@ static int snd_sonicvibes_free(struct sonicvibes *sonic)
         pci_write_config_dword(sonic->pci, 0x40, sonic->dmaa_port);
         pci_write_config_dword(sonic->pci, 0x48, sonic->dmac_port);
         if (sonic->irq >= 0)
-                free_irq(sonic->irq, (void *)sonic);
+                free_irq(sonic->irq, sonic);
         release_and_free_resource(sonic->res_dmaa);
         release_and_free_resource(sonic->res_dmac);
         pci_release_regions(sonic->pci);
@@ -1257,7 +1257,8 @@ static int __devinit snd_sonicvibes_create(struct snd_card *card,
         sonic->midi_port = pci_resource_start(pci, 3);
         sonic->game_port = pci_resource_start(pci, 4);
 
-        if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_DISABLED|IRQF_SHARED, "S3 SonicVibes", (void *)sonic)) {
+        if (request_irq(pci->irq, snd_sonicvibes_interrupt, IRQF_SHARED,
+                        "S3 SonicVibes", sonic)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_sonicvibes_free(sonic);
                 return -EBUSY;
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index 89fe5760df36..474f2d451ae8 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3608,7 +3608,7 @@ int __devinit snd_trident_create(struct snd_card *card,
         }
         trident->port = pci_resource_start(pci, 0);
 
-        if (request_irq(pci->irq, snd_trident_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_trident_interrupt, IRQF_SHARED,
                         "Trident Audio", trident)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_trident_free(trident);
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 674b8429247b..a572b018807f 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -2307,7 +2307,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
         if (request_irq(pci->irq,
                         chip_type == TYPE_VIA8233 ?
                         snd_via8233_interrupt : snd_via686_interrupt,
-                        IRQF_DISABLED|IRQF_SHARED,
+                        IRQF_SHARED,
                         card->driver, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_via82xx_free(chip);
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index feb27c966256..17d6b847585f 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -1124,7 +1124,7 @@ static int __devinit snd_via82xx_create(struct snd_card *card,
                 return err;
         }
         chip->port = pci_resource_start(pci, 0);
-        if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_DISABLED|IRQF_SHARED,
+        if (request_irq(pci->irq, snd_via82xx_interrupt, IRQF_SHARED,
                         card->driver, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_via82xx_free(chip);
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c
index af49e8aabf55..89f58ea180b3 100644
--- a/sound/pci/vx222/vx222.c
+++ b/sound/pci/vx222/vx222.c
@@ -169,8 +169,8 @@ static int __devinit snd_vx222_create(struct snd_card *card, struct pci_dev *pci
         for (i = 0; i < 2; i++)
                 vx->port[i] = pci_resource_start(pci, i + 1);
 
-        if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_DISABLED|IRQF_SHARED,
-                        CARD_NAME, (void *) chip)) {
+        if (request_irq(pci->irq, snd_vx_irq_handler, IRQF_SHARED,
+                        CARD_NAME, chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_vx222_free(chip);
                 return -EBUSY;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 843dcca1d4a5..7881944a1957 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2154,7 +2154,7 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
                 snd_dma_free_pages(&chip->work_ptr);
         
         if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
+                free_irq(chip->irq, chip);
         release_and_free_resource(chip->res_reg_area);
 
         pci_write_config_word(chip->pci, 0x40, chip->old_legacy_ctrl);
@@ -2301,7 +2301,8 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
                 snd_ymfpci_free(chip);
                 return -EBUSY;
         }
-        if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_DISABLED|IRQF_SHARED, "YMFPCI", (void *) chip)) {
+        if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED,
+                        "YMFPCI", chip)) {
                 snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                 snd_ymfpci_free(chip);
                 return -EBUSY;