From 5966addb5b6fce5d3aa56f996e9401de61148e4f Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 18 Jan 2013 10:43:48 -0700 Subject: [PATCH] --- yaml --- r: 354079 b: refs/heads/master c: 046e0d10bda65c2b096627765b302b3123beee47 h: refs/heads/master i: 354077: b8fbb650ed888f2d5e267152c171d5dd16e21f55 354075: 92000217e5307968d3efd1dfad156051193b2e9d 354071: 956663910ccb350bcbe8a043ffb64f0c93a305d9 354063: f86fbcee1f54724285bae6861e7321392fadd963 354047: da6a08ed8976cedd0527dad8298231bf61147b37 v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/addi_apci_16xx.c | 20 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 78f216fe964f..c09f36738b25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58b6728c8cecd5022be68b3ac513d7055b869710 +refs/heads/master: 046e0d10bda65c2b096627765b302b3123beee47 diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c index e384d4c493e7..ba4b0b10defc 100644 --- a/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c +++ b/trunk/drivers/staging/comedi/drivers/addi_apci_16xx.c @@ -35,15 +35,6 @@ static const struct addi_board apci16xx_boardtypes[] = { }, }; -static irqreturn_t v_ADDI_Interrupt(int irq, void *d) -{ - struct comedi_device *dev = d; - const struct addi_board *this_board = comedi_board(dev); - - this_board->interrupt(irq, d); - return IRQ_RETVAL(1); -} - static const void *addi_find_boardinfo(struct comedi_device *dev, struct pci_dev *pcidev) { @@ -120,15 +111,6 @@ static int apci16xx_auto_attach(struct comedi_device *dev, devpriv->s_EeParameters.ui_MinDelaytimeNs = this_board->ui_MinDelaytimeNs; - /* ## */ - - if (pcidev->irq > 0) { - ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED, - dev->board_name, dev); - if (ret == 0) - dev->irq = pcidev->irq; - } - n_subdevices = 7; ret = comedi_alloc_subdevices(dev, n_subdevices); if (ret) @@ -186,8 +168,6 @@ static void apci16xx_detach(struct comedi_device *dev) struct addi_private *devpriv = dev->private; if (devpriv) { - if (dev->irq) - free_irq(dev->irq, dev); if (devpriv->dw_AiBase) iounmap(devpriv->dw_AiBase); }