diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-29 11:29:12 +1100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-29 11:29:12 +1100 |
| commit | fcd82664cb421b043f97ad194a7eda3592e0349e (patch) | |
| tree | 311c29c54601cb02fac795a340117b137aa60f75 /drivers/atm | |
| parent | cd2169fbfb39e6fc2fb9055ed2eedaa68f53c734 (diff) | |
| download | linux-3.10-fcd82664cb421b043f97ad194a7eda3592e0349e.tar.gz linux-3.10-fcd82664cb421b043f97ad194a7eda3592e0349e.tar.bz2 linux-3.10-fcd82664cb421b043f97ad194a7eda3592e0349e.zip | |
solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq()
Neither of these are necessary.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/solos-pci.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 2ef81575378..f2736dd3eb0 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c @@ -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); |