diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-08-25 17:55:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 13:26:29 -0700 |
| commit | 8075bfb67566376f706baa7cbc6b5b0e3eb99318 (patch) | |
| tree | 95dfa5af63eaba8c4a768b85cd27bd15819f6c0e /drivers/staging/comedi/drivers/s626.c | |
| parent | 3757e79559534e722df93e184078a141dc0bcfa7 (diff) | |
staging: comedi: s626: use comedi_pci_detach()
Use comedi_pci_detach() to handle the boilerplate part of the (*detach)
for this PCI driver.
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/s626.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 8778bb88d74d..a868d73f86a3 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -2914,13 +2914,8 @@ static void s626_detach(struct comedi_device *dev) writel(S626_MC1_SHUTDOWN, dev->mmio + S626_P_MC1); writel(S626_ACON1_BASE, dev->mmio + S626_P_ACON1); } - - if (dev->irq) - free_irq(dev->irq, dev); - if (dev->mmio) - iounmap(dev->mmio); } - comedi_pci_disable(dev); + comedi_pci_detach(dev); s626_free_dma_buffers(dev); } |