Commit 665ee190 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 655cd940
...@@ -1082,6 +1082,22 @@ static int pcl818_alloc_dma(struct comedi_device *dev, unsigned int dma_chan) ...@@ -1082,6 +1082,22 @@ static int pcl818_alloc_dma(struct comedi_device *dev, unsigned int dma_chan)
return 0; 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) static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
const struct pcl818_board *board = dev->board_ptr; const struct pcl818_board *board = dev->board_ptr;
...@@ -1217,13 +1233,8 @@ static void pcl818_detach(struct comedi_device *dev) ...@@ -1217,13 +1233,8 @@ static void pcl818_detach(struct comedi_device *dev)
if (devpriv) { if (devpriv) {
pcl818_ai_cancel(dev, dev->read_subdev); pcl818_ai_cancel(dev, dev->read_subdev);
pcl818_reset(dev); 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); comedi_legacy_detach(dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment