diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-12 10:55:56 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-17 14:25:20 -0800 |
| commit | 665ee190c99d05940ed0959717b78ef176b92e95 (patch) | |
| tree | b599974cb787123aa805cafb69afc013988c276c /drivers/staging/comedi/drivers/pcl818.c | |
| parent | staging: comedi: pcl818: introduce pcl818_alloc_dma() (diff) | |
| download | linux-dev-665ee190c99d05940ed0959717b78ef176b92e95.tar.xz linux-dev-665ee190c99d05940ed0959717b78ef176b92e95.zip | |
staging: comedi: pcl818: introduce pcl818_dma_free()
For aesthetics, move the freeing of the DMA channel and the buffers to
a helper 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/pcl818.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl818.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index b25ff3531d23..beb03ec10cd1 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -1082,6 +1082,22 @@ static int pcl818_alloc_dma(struct comedi_device *dev, unsigned int dma_chan) return 0; } +static void pcl818_free_dma(struct comedi_device *dev) +{ + struct pcl818_private *devpriv = dev->private; + int i; + + if (!devpriv) + return; + + if (devpriv->dma) + free_dma(devpriv->dma); + for (i = 0; i < 2; i++) { + if (devpriv->dmabuf[i]) + free_pages(devpriv->dmabuf[i], devpriv->dmapages); + } +} + static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct pcl818_board *board = dev->board_ptr; @@ -1217,13 +1233,8 @@ static void pcl818_detach(struct comedi_device *dev) if (devpriv) { pcl818_ai_cancel(dev, dev->read_subdev); pcl818_reset(dev); - if (devpriv->dma) - free_dma(devpriv->dma); - if (devpriv->dmabuf[0]) - free_pages(devpriv->dmabuf[0], devpriv->dmapages); - if (devpriv->dmabuf[1]) - free_pages(devpriv->dmabuf[1], devpriv->dmapages); } + pcl818_free_dma(dev); comedi_legacy_detach(dev); } |