diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-28 19:29:12 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-28 19:29:12 -0500 |
commit | fcd82664cb421b043f97ad194a7eda3592e0349e (patch) | |
tree | 311c29c54601cb02fac795a340117b137aa60f75 /drivers/atm | |
parent | cd2169fbfb39e6fc2fb9055ed2eedaa68f53c734 (diff) |
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 2ef81575378d..f2736dd3eb02 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) | |||
570 | 570 | ||
571 | //ACK IRQ | 571 | //ACK IRQ |
572 | iowrite32(0, card->config_regs + IRQ_CLEAR); | 572 | iowrite32(0, card->config_regs + IRQ_CLEAR); |
573 | //Disable IRQs from FPGA | ||
574 | iowrite32(0, card->config_regs + IRQ_EN_ADDR); | ||
575 | 573 | ||
576 | if (card->atmdev[0]) | 574 | if (card->atmdev[0]) |
577 | tasklet_schedule(&card->tlet); | 575 | tasklet_schedule(&card->tlet); |
578 | else | 576 | else |
579 | wake_up(&card->fw_wq); | 577 | wake_up(&card->fw_wq); |
580 | 578 | ||
581 | //Enable IRQs from FPGA | ||
582 | iowrite32(1, card->config_regs + IRQ_EN_ADDR); | ||
583 | return IRQ_RETVAL(handled); | 579 | return IRQ_RETVAL(handled); |
584 | } | 580 | } |
585 | 581 | ||
@@ -1132,7 +1128,7 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
1132 | } | 1128 | } |
1133 | */ | 1129 | */ |
1134 | //dev_dbg(&card->dev->dev, "Requesting IRQ: %d\n",dev->irq); | 1130 | //dev_dbg(&card->dev->dev, "Requesting IRQ: %d\n",dev->irq); |
1135 | err = request_irq(dev->irq, solos_irq, IRQF_DISABLED|IRQF_SHARED, | 1131 | err = request_irq(dev->irq, solos_irq, IRQF_SHARED, |
1136 | "solos-pci", card); | 1132 | "solos-pci", card); |
1137 | if (err) { | 1133 | if (err) { |
1138 | dev_dbg(&card->dev->dev, "Failed to request interrupt IRQ: %d\n", dev->irq); | 1134 | dev_dbg(&card->dev->dev, "Failed to request interrupt IRQ: %d\n", dev->irq); |