diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-08-12 11:17:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 12:23:25 -0700 |
| commit | bb83abed7dd79ae1f0471c53144934efa57d7919 (patch) | |
| tree | 1eafcb88fc941b6eb9c30c382965b8d29aa74b80 /drivers/staging/comedi/drivers/amplc_dio200_pci.c | |
| parent | 294de579db53a810cb179fb06909c2dbdf17b74d (diff) | |
staging: comedi: amplc_dio200: remove dio200_common_detach()
This exported function just does a free_irq() to release the interrupt
handler for the legacy and PCI dio200 drivers.
The legacy driver also calls comedi_legacy_detach() which would also
do the free_irq(). For that driver the just use comedi_legacy_detach()
directly for the (*detach).
For the PCI driver, add the free_irq() to the private (*datach) function.
Remove the, then unused, dio200_common_detach() function.
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/amplc_dio200_pci.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_dio200_pci.c b/drivers/staging/comedi/drivers/amplc_dio200_pci.c index 2dfdcaf3612c..423b6249d4f1 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200_pci.c +++ b/drivers/staging/comedi/drivers/amplc_dio200_pci.c @@ -389,7 +389,8 @@ static int dio200_pci_auto_attach(struct comedi_device *dev, static void dio200_pci_detach(struct comedi_device *dev) { - amplc_dio200_common_detach(dev); + if (dev->irq) + free_irq(dev->irq, dev); if (dev->mmio) iounmap(dev->mmio); comedi_pci_disable(dev); |