ALSA: mpu401: clean up interrupt specification

The semantics of snd_mpu401_uart_new()'s interrupt parameters are
somewhat counterintuitive:  To prevent the function from allocating its
own interrupt, either the irq number must be invalid, or the irq_flags
parameter must be zero.  At the same time, the irq parameter being
invalid specifies that the mpu401 code has to work without an interrupt
allocated by the caller.  This implies that, if there is an interrupt
and it is allocated by the caller, the irq parameter must be set to
a valid-looking number which then isn't actually used.

With the removal of IRQF_DISABLED, zero becomes a valid irq_flags value,
which forces us to handle the parameters differently.

This patch introduces a new flag MPU401_INFO_IRQ_HOOK for when the
device interrupt is handled by the caller, and makes the allocation of
the interrupt to depend only on the irq parameter.  As suggested by
Takashi, the irq_flags parameter was dropped because, when used, it had
the constant value IRQF_DISABLED.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

19 files changed, 21 insertions, 30 deletions

diff --git a/sound/isa/ad1816a/ad1816a.c b/sound/isa/ad1816a/ad1816a.c
index 3cb75bc97699..a87a2b566e19 100644
--- a/sound/isa/ad1816a/ad1816a.c
+++ b/sound/isa/ad1816a/ad1816a.c
@@ -204,7 +204,7 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard
 
         if (mpu_port[dev] > 0) {
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                        mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,
+                                        mpu_port[dev], 0, mpu_irq[dev],
                                         NULL) < 0)
                         printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]);
         }
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index 20becc89f6f6..706effd6b3cd 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -256,7 +256,6 @@ static int __devinit snd_card_als100_probe(int dev,
                                         mpu_type,
                                         mpu_port[dev], 0, 
                                         mpu_irq[dev],
-                                        mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                         NULL) < 0)
                         snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
         }
diff --git a/sound/isa/azt2320.c b/sound/isa/azt2320.c
index aac8dc15c2fe..b7bdbf307740 100644
--- a/sound/isa/azt2320.c
+++ b/sound/isa/azt2320.c
@@ -234,8 +234,7 @@ static int __devinit snd_card_azt2320_probe(int dev,
         if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
                                 mpu_port[dev], 0,
-                                mpu_irq[dev], IRQF_DISABLED,
-                                NULL) < 0)
+                                mpu_irq[dev], NULL) < 0)
                         snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
         }
 
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index fe79a169acb5..dca69f80305f 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -597,7 +597,7 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
         if (mpuport[dev] != SNDRV_AUTO_PORT) {
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
                                         mpuport[dev], 0, mpuirq[dev],
-                                        IRQF_DISABLED, NULL) < 0)
+                                        NULL) < 0)
                         printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n",
                                 mpuport[dev]);
         }
diff --git a/sound/isa/cs423x/cs4231.c b/sound/isa/cs423x/cs4231.c
index cb9153e75b82..409fa0ad7843 100644
--- a/sound/isa/cs423x/cs4231.c
+++ b/sound/isa/cs423x/cs4231.c
@@ -131,7 +131,6 @@ static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n)
                         mpu_irq[n] = -1;
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
                                         mpu_port[n], 0, mpu_irq[n],
-                                        mpu_irq[n] >= 0 ? IRQF_DISABLED : 0,
                                         NULL) < 0)
                         dev_warn(dev, "MPU401 not detected\n");
         }
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index 999dc1e0fdbd..0dbde461e6c1 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -449,8 +449,7 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
                         mpu_irq[dev] = -1;
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
                                         mpu_port[dev], 0,
-                                        mpu_irq[dev],
-                                        mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0)
+                                        mpu_irq[dev], NULL) < 0)
                         printk(KERN_WARNING IDENT ": MPU401 not detected\n");
         }
 
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index 0cde8131a575..5493e9e4bcd5 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -174,7 +174,7 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)
                         chip->mpu_port > 0) {
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
                                 chip->mpu_port, 0,
-                                mpu_irq[n], IRQF_DISABLED, NULL);
+                                mpu_irq[n], NULL);
                 if (error < 0)
                         return error;
         }
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index fb4d6b34bbca..aeee8f8bf5e9 100644
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -2160,8 +2160,8 @@ static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
 
         if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
-                                          mpu_port[dev], 0,
-                                          irq[dev], 0, &chip->rmidi);
+                                          mpu_port[dev], MPU401_INFO_IRQ_HOOK,
+                                          -1, &chip->rmidi);
                 if (err < 0)
                         return err;
         }
diff --git a/sound/isa/galaxy/galaxy.c b/sound/isa/galaxy/galaxy.c
index ee54df082b9c..e51d3244742a 100644
--- a/sound/isa/galaxy/galaxy.c
+++ b/sound/isa/galaxy/galaxy.c
@@ -585,8 +585,7 @@ static int __devinit snd_galaxy_probe(struct device *dev, unsigned int n)
 
         if (mpu_port[n] >= 0) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                          mpu_port[n], 0, mpu_irq[n],
-                                          IRQF_DISABLED, NULL);
+                                          mpu_port[n], 0, mpu_irq[n], NULL);
                 if (err < 0)
                         goto error;
         }
diff --git a/sound/isa/gus/gusextreme.c b/sound/isa/gus/gusextreme.c
index 008e8e5bfa37..c4733c08b60b 100644
--- a/sound/isa/gus/gusextreme.c
+++ b/sound/isa/gus/gusextreme.c
@@ -317,8 +317,7 @@ static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
 
         if (es1688->mpu_port >= 0x300) {
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
-                                es1688->mpu_port, 0,
-                                mpu_irq[n], IRQF_DISABLED, NULL);
+                                es1688->mpu_port, 0, mpu_irq[n], NULL);
                 if (error < 0)
                         goto out;
         }
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 91d6023a63e5..0961e2cf20ca 100644
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -600,7 +600,7 @@ static int __devinit snd_msnd_attach(struct snd_card *card)
                                           mpu_io[0],
                                           MPU401_MODE_INPUT |
                                           MPU401_MODE_OUTPUT,
-                                          mpu_irq[0], IRQF_DISABLED,
+                                          mpu_irq[0],
                                           &chip->rmidi);
                 if (err < 0) {
                         printk(KERN_ERR LOGNAME
diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c
index 9b915e27b5bd..de99f47770bf 100644
--- a/sound/isa/opl3sa2.c
+++ b/sound/isa/opl3sa2.c
@@ -707,8 +707,9 @@ static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
         }
         if (midi_port[dev] >= 0x300 && midi_port[dev] < 0x340) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,
-                                               midi_port[dev], 0,
-                                               xirq, 0, &chip->rmidi)) < 0)
+                                               midi_port[dev],
+                                               MPU401_INFO_IRQ_HOOK, -1,
+                                               &chip->rmidi)) < 0)
                         return err;
         }
         sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c
index 8c24102d0d93..d94d0f35cb76 100644
--- a/sound/isa/opti9xx/miro.c
+++ b/sound/isa/opti9xx/miro.c
@@ -1377,8 +1377,7 @@ static int __devinit snd_miro_probe(struct snd_card *card)
                 rmidi = NULL;
         else {
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                mpu_port, 0, miro->mpu_irq, IRQF_DISABLED,
-                                &rmidi);
+                                mpu_port, 0, miro->mpu_irq, &rmidi);
                 if (error < 0)
                         snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",
                                    mpu_port);
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index c35dc68930dc..346e12baa98e 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -914,7 +914,7 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
                 rmidi = NULL;
         else {
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                mpu_port, 0, mpu_irq, IRQF_DISABLED, &rmidi);
+                                mpu_port, 0, mpu_irq, &rmidi);
                 if (error)
                         snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",
                                    mpu_port);
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index 8ccbcddf08e1..54e3c2c18060 100644
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -322,7 +322,6 @@ static int __devinit snd_jazz16_probe(struct device *devptr, unsigned int dev)
                                         MPU401_HW_MPU401,
                                         mpu_port[dev], 0,
                                         mpu_irq[dev],
-                                        mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                         NULL) < 0)
                         snd_printk(KERN_ERR "no MPU-401 device at 0x%lx\n",
                                         mpu_port[dev]);
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 4d1c5a300ff8..237f8bd7fbe4 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -394,8 +394,9 @@ static int __devinit snd_sb16_probe(struct snd_card *card, int dev)
 
         if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
-                                               chip->mpu_port, 0,
-                                               xirq, 0, &chip->rmidi)) < 0)
+                                               chip->mpu_port,
+                                               MPU401_INFO_IRQ_HOOK, -1,
+                                               &chip->rmidi)) < 0)
                         return err;
                 chip->rmidi_callback = snd_mpu401_uart_interrupt;
         }
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c
index 9a8bbf6dd62a..207c161f100c 100644
--- a/sound/isa/sc6000.c
+++ b/sound/isa/sc6000.c
@@ -658,8 +658,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev)
                 if (snd_mpu401_uart_new(card, 0,
                                         MPU401_HW_MPU401,
                                         mpu_port[dev], 0,
-                                        mpu_irq[dev], IRQF_DISABLED,
-                                        NULL) < 0)
+                                        mpu_irq[dev], NULL) < 0)
                         snd_printk(KERN_ERR "no MPU-401 device at 0x%lx ?\n",
                                         mpu_port[dev]);
         }
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c
index e2d5d2d3ed96..f2379e102b63 100644
--- a/sound/isa/sscape.c
+++ b/sound/isa/sscape.c
@@ -825,8 +825,7 @@ static int __devinit create_mpu401(struct snd_card *card, int devnum,
         int err;
 
         err = snd_mpu401_uart_new(card, devnum, MPU401_HW_MPU401, port,
-                                  MPU401_INFO_INTEGRATED, irq, IRQF_DISABLED,
-                                  &rawmidi);
+                                  MPU401_INFO_INTEGRATED, irq, &rawmidi);
         if (err == 0) {
                 struct snd_mpu401 *mpu = rawmidi->private_data;
                 mpu->open_input = mpu401_open;
diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c
index 711670e4a425..83f291d89a95 100644
--- a/sound/isa/wavefront/wavefront.c
+++ b/sound/isa/wavefront/wavefront.c
@@ -449,8 +449,7 @@ snd_wavefront_probe (struct snd_card *card, int dev)
         if (cs4232_mpu_port[dev] > 0 && cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
                 err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232,
                                           cs4232_mpu_port[dev], 0,
-                                          cs4232_mpu_irq[dev], IRQF_DISABLED,
-                                          NULL);
+                                          cs4232_mpu_irq[dev], NULL);
                 if (err < 0) {
                         snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");
                         return err;