Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fcd82664cb421b043f97ad194a7eda3592e0349e

Authored by David Woodhouse
1 parent cd2169fbfb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 5 deletions Side-by-side Diff

drivers/atm/solos-pci.c
Diff comments   View file @ fcd8266
... ... @@ -570,16 +570,12 @@
570 570  
571 571 //ACK IRQ
572 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 574 if (card->atmdev[0])
577 575 tasklet_schedule(&card->tlet);
578 576 else
579 577 wake_up(&card->fw_wq);
580 578  
581   - //Enable IRQs from FPGA
582   - iowrite32(1, card->config_regs + IRQ_EN_ADDR);
583 579 return IRQ_RETVAL(handled);
584 580 }
585 581  
... ... @@ -1132,7 +1128,7 @@
1132 1128 }
1133 1129 */
1134 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 1132 "solos-pci", card);
1137 1133 if (err) {
1138 1134 dev_dbg(&card->dev->dev, "Failed to request interrupt IRQ: %d\n", dev->irq);