[PATCH 23/37] staging: comedi: pcl816: introduce pcl816_free_dma()

[H Hartley Sweeten]

For aesthetics, move the freeing of the DMA channel and the buffers to
a helper function.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/pcl816.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcl816.c 
b/drivers/staging/comedi/drivers/pcl816.c
index 0374f83..4cff02a 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -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);
 }
 
-- 
2.0.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel