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>

1 files changed, 6 insertions, 4 deletions

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 0ccc0eb75775..8531b983f3af 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2748,8 +2748,9 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
         if (!c->no_mpu401) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,
                         ICEREG(ice, MPU1_CTRL),
-                        (c->mpu401_1_info_flags | MPU401_INFO_INTEGRATED),
-                        ice->irq, 0, &ice->rmidi[0]);
+                        c->mpu401_1_info_flags |
+                        MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,
+                        -1, &ice->rmidi[0]);
                 if (err < 0) {
                         snd_card_free(card);
                         return err;
@@ -2764,8 +2765,9 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
                         /*  2nd port used  */
                         err = snd_mpu401_uart_new(card, 1, MPU401_HW_ICE1712,
                                 ICEREG(ice, MPU2_CTRL),
-                                (c->mpu401_2_info_flags | MPU401_INFO_INTEGRATED),
-                                ice->irq, 0, &ice->rmidi[1]);
+                                c->mpu401_2_info_flags |
+                                MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK,
+                                -1, &ice->rmidi[1]);
 
                         if (err < 0) {
                                 snd_card_free(card);