Skip to content

Commit

Permalink
solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in sol…
Browse files Browse the repository at this point in the history
…os_irq()

Neither of these are necessary.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Jan 29, 2009
1 parent cd2169f commit fcd8266
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions drivers/atm/solos-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit fcd8266

Please sign in to comment.