leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: pcl812: introduce pcl812_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:06 -07:00 committed by Greg Kroah-Hartman
parent 075400af76
commit 91ac6981bc
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/comedi/drivers/pcl812.c
View File

@ -1220,6 +1220,22 @@ static int pcl812_alloc_dma(struct comedi_device *dev, unsigned int dma_chan)
return 0;
}
static void pcl812_free_dma(struct comedi_device *dev)
{
struct pcl812_private *devpriv = dev->private;
int i;
if (!devpriv)
return;
for (i = 0; i < 2; i++) {
if (devpriv->dmabuf[i])
free_pages(devpriv->dmabuf[i], devpriv->dmapages);
}
if (devpriv->dma)
free_dma(devpriv->dma);
}
static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
const struct pcl812_board *board = dev->board_ptr;
@ -1391,16 +1407,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)
static void pcl812_detach(struct comedi_device *dev)
{
struct pcl812_private *devpriv = dev->private;
if (devpriv) {
if (devpriv->dmabuf[0])
free_pages(devpriv->dmabuf[0], devpriv->dmapages);
if (devpriv->dmabuf[1])
free_pages(devpriv->dmabuf[1], devpriv->dmapages);
if (devpriv->dma)
free_dma(devpriv->dma);
}
pcl812_free_dma(dev);
comedi_legacy_detach(dev);
}