Commit 01602774 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by Takashi Iwai
Browse files

ALSA: emu10k1: simplify interrupt handler, part 2 



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: default avatarOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230518093047.3697887-2-oswald.buddenhagen@gmx.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 583307ba

sound/pci/emu10k1/irq.c

+0 −18
Original line number Diff line number Diff line
@@ -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 */

	}