diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-08-25 17:55:48 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 13:24:54 -0700 |
| commit | aac307f9dd5ce1fe651140a036ab4b0a0571b54a (patch) | |
| tree | 28797d71317c989f4b10ecf517641959dfea7cdb /drivers/staging/comedi/drivers/ni_65xx.c | |
| parent | 081b6ee6f1060517a9bcee26418c8ae762c7410e (diff) | |
staging: comedi: comedi_pci: introduce comedi_pci_detach()
Introduce a generic (*detach) function for comedi PCI drivers to handle
the boilerplate code needed to detach a PCI driver.
This function works similar to comedi_legacy_detach() where it will:
* free the dev->irq if it has been requested
* iounmap the dev->mmio addres if it has been ioremap'ed
The helper then calls comedi_pci_disable() to release the regions and
disable the PCI device.
Use the new helper directly for the (*detach) in the following cases:
* where comedi_pci_disable() is used directly for the (*detach)
* where the detach function is just boilerplate
Use the new helper in the (*detach) of the simpler PCI drivers. Call
the helper after disabling interrupts (reset) and before any additional
cleanup (kfree) to avoid any race conditions with the interrupt handler.
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_65xx.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_65xx.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index bf0a50dd8978..63a33de75679 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c @@ -792,13 +792,9 @@ static int ni_65xx_auto_attach(struct comedi_device *dev, static void ni_65xx_detach(struct comedi_device *dev) { - if (dev->mmio) { + if (dev->mmio) writeb(0x00, dev->mmio + NI_65XX_CTRL_REG); - iounmap(dev->mmio); - } - if (dev->irq) - free_irq(dev->irq, dev); - comedi_pci_disable(dev); + comedi_pci_detach(dev); } static struct comedi_driver ni_65xx_driver = { |