summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_labpc_pci.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-06-20 11:10:33 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-29 14:17:59 -0700
commitba9d29fe102d4b4e388ba510f4a71b8b737144b9 (patch)
treef03764fafc4668bc077ddede733e637639c3ad0e /drivers/staging/comedi/drivers/ni_labpc_pci.c
parentd1296561a49aa3981520147cf146a5812c77a08c (diff)
staging: comedi: mite.h: remove mite_irq()
This inline function simply returns the 'irq' of the struct pci_dev pointer that is stored in struct mite_struct. This pci_dev pointer is the same as the one that is already available in the (*auto_attach) functions where mite_irq() is used. Use the pci_dev pointer directly to get the irq and remove the unnecessary inline function to remove the indirection. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc_pci.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_labpc_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c
index 739597068297..384c427092e4 100644
--- a/drivers/staging/comedi/drivers/ni_labpc_pci.c
+++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c
@@ -84,7 +84,7 @@ static int labpc_pci_auto_attach(struct comedi_device *dev,
return ret;
dev->iobase = (unsigned long)devpriv->mite->daq_io_addr;
- return labpc_common_attach(dev, mite_irq(devpriv->mite), IRQF_SHARED);
+ return labpc_common_attach(dev, pcidev->irq, IRQF_SHARED);
}
static void labpc_pci_detach(struct comedi_device *dev)