solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq()
authorDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 29 Jan 2009 00:29:12 +0000 (11:29 +1100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Thu, 29 Jan 2009 00:29:12 +0000 (11:29 +1100)
Neither of these are necessary.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
drivers/atm/solos-pci.c

index 2ef81575378d2333802963ca40d9ed9bb49d346e..f2736dd3eb02b698ce9d257b96a79a14e70c20f8 100644 (file)
@@ -570,16 +570,12 @@ static irqreturn_t solos_irq(int irq, void *dev_id)
 
        //ACK IRQ
        iowrite32(0, card->config_regs + IRQ_CLEAR);
-       //Disable IRQs from FPGA
-       iowrite32(0, card->config_regs + IRQ_EN_ADDR);
 
        if (card->atmdev[0])
                tasklet_schedule(&card->tlet);
        else
                wake_up(&card->fw_wq);
 
-       //Enable IRQs from FPGA
-       iowrite32(1, card->config_regs + IRQ_EN_ADDR);
        return IRQ_RETVAL(handled);
 }
 
@@ -1132,7 +1128,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
        }
 */
        //dev_dbg(&card->dev->dev, "Requesting IRQ: %d\n",dev->irq);
-       err = request_irq(dev->irq, solos_irq, IRQF_DISABLED|IRQF_SHARED,
+       err = request_irq(dev->irq, solos_irq, IRQF_SHARED,
                          "solos-pci", card);
        if (err) {
                dev_dbg(&card->dev->dev, "Failed to request interrupt IRQ: %d\n", dev->irq);