ALSA: emu10k1: simplify interrupt handler, part 2
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Thu, 18 May 2023 09:30:45 +0000 (11:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 18 May 2023 11:06:13 +0000 (13:06 +0200)
Remove weird INTE_* clearing code. The bits were a subset of the
actually handled interrupts, which kind of contradicted the stated
purpose. I suppose it would make sense to complete the set and negate
it, but interrupts being enabled out of the blue is neither something
that happens a lot, nor should it result in just one error message, IMO.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230518093047.3697887-2-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/emu10k1/irq.c

index 0cb89bd..3125113 100644 (file)
@@ -146,26 +146,8 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
                }
 
                if (status) {
-                       unsigned int bits;
                        dev_err(emu->card->dev,
                                "unhandled interrupt: 0x%08x\n", status);
-                       //make sure any interrupts we don't handle are disabled:
-                       bits = INTE_FXDSPENABLE |
-                               INTE_PCIERRORENABLE |
-                               INTE_VOLINCRENABLE |
-                               INTE_VOLDECRENABLE |
-                               INTE_MUTEENABLE |
-                               INTE_MICBUFENABLE |
-                               INTE_ADCBUFENABLE |
-                               INTE_EFXBUFENABLE |
-                               INTE_GPSPDIFENABLE |
-                               INTE_CDSPDIFENABLE |
-                               INTE_INTERVALTIMERENB |
-                               INTE_MIDITXENABLE |
-                               INTE_MIDIRXENABLE;
-                       if (emu->audigy)
-                               bits |= INTE_A_MIDITXENABLE2 | INTE_A_MIDIRXENABLE2;
-                       snd_emu10k1_intr_disable(emu, bits);
                }
                outl(orig_status, emu->port + IPR); /* ack all */
        }