diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /sound/pci/cs4281.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'sound/pci/cs4281.c')
| -rw-r--r-- | sound/pci/cs4281.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c index 1990430a21c1..d54924e60bb1 100644 --- a/sound/pci/cs4281.c +++ b/sound/pci/cs4281.c | |||
| @@ -493,7 +493,7 @@ struct cs4281 { | |||
| 493 | 493 | ||
| 494 | }; | 494 | }; |
| 495 | 495 | ||
| 496 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 496 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id); |
| 497 | 497 | ||
| 498 | static struct pci_device_id snd_cs4281_ids[] = { | 498 | static struct pci_device_id snd_cs4281_ids[] = { |
| 499 | { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ | 499 | { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */ |
| @@ -1814,7 +1814,7 @@ static int __devinit snd_cs4281_midi(struct cs4281 * chip, int device, | |||
| 1814 | * Interrupt handler | 1814 | * Interrupt handler |
| 1815 | */ | 1815 | */ |
| 1816 | 1816 | ||
| 1817 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1817 | static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id) |
| 1818 | { | 1818 | { |
| 1819 | struct cs4281 *chip = dev_id; | 1819 | struct cs4281 *chip = dev_id; |
| 1820 | unsigned int status, dma, val; | 1820 | unsigned int status, dma, val; |