IRQ: Maintain regs pointer globally rather than passing to IRQ handlers

[mirror_ubuntu-artful-kernel.git] / sound / pci / als300.c

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 91899f87f0376ca7ffe95e66430e530da74d6aaa..9b16c299f0a9d33f91479a50db01545bfdd9905e 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -204,8 +204,7 @@ static int snd_als300_dev_free(struct snd_device *device)
        return snd_als300_free(chip);
 }
 
-static irqreturn_t snd_als300_interrupt(int irq, void *dev_id,
-                                               struct pt_regs *regs)
+static irqreturn_t snd_als300_interrupt(int irq, void *dev_id)
 {
        u8 status;
        struct snd_als300 *chip = dev_id;
@@ -236,8 +235,7 @@ static irqreturn_t snd_als300_interrupt(int irq, void *dev_id,
        return IRQ_HANDLED;
 }
 
-static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id,
-                                               struct pt_regs *regs)
+static irqreturn_t snd_als300plus_interrupt(int irq, void *dev_id)
 {
        u8 general, mpu, dram;
        struct snd_als300 *chip = dev_id;
@@ -724,7 +722,7 @@ static int __devinit snd_als300_create(snd_card_t *card,
        else
                irq_handler = snd_als300_interrupt;
 
-       if (request_irq(pci->irq, irq_handler, SA_INTERRUPT|SA_SHIRQ,
+       if (request_irq(pci->irq, irq_handler, IRQF_DISABLED|IRQF_SHARED,
                                        card->shortname, (void *)chip)) {
                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
                snd_als300_free(chip);