mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

staging: comedi: pcl816: introduce pcl816_free_dma()

Browse source 
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>
This commit is contained in:
H Hartley Sweeten 2015-01-12 10:56:01 -07:00 committed by Greg Kroah-Hartman
parent 1fa51639e5
commit d7b8bbb6a7
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drivers/staging/comedi/drivers/pcl816.c
View file

@ -704,6 +704,22 @@ static int pcl816_alloc_dma(struct comedi_device *dev,
return 0;
}
static void pcl816_free_dma(struct comedi_device *dev)
{
struct pcl816_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 pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct pcl816_board *board = dev->board_ptr;
@ -785,18 +801,11 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcl816_detach(struct comedi_device *dev)
{
struct pcl816_private *devpriv = dev->private;
if (dev->private) {
pcl816_ai_cancel(dev, dev->read_subdev);
pcl816_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);
}
pcl816_free_dma(dev);
comedi_legacy_detach(dev);
}