staging: comedi: ni_at_a2150: introduce a2150_free_dma()

For aesthetics, introduce a helper function to free the DMA channel and
buffer.

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>

diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c
index 11b168156a6a06eb209471daf359da3a77402ef7..de2e87780de911d0d723e5d953d47aa329853e34 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_at_a2150.c
+++ b/drivers/staging/comedi/drivers/ni_at_a2150.c
@@ -720,6 +720,18 @@ static void a2150_alloc_irq_dma(struct comedi_device *dev,
        set_dma_mode(dma_chan, DMA_MODE_READ);
 }
 
+static void a2150_free_dma(struct comedi_device *dev)
+{
+       struct a2150_private *devpriv = dev->private;
+
+       if (!devpriv)
+               return;
+
+       if (devpriv->dma)
+               free_dma(devpriv->dma);
+       kfree(devpriv->dma_buffer);
+}
+
 /* probes board type, returns offset */
 static int a2150_probe(struct comedi_device *dev)
 {
@@ -808,15 +820,9 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static void a2150_detach(struct comedi_device *dev)
 {
-       struct a2150_private *devpriv = dev->private;
-
        if (dev->iobase)
                outw(APD_BIT | DPD_BIT, dev->iobase + CONFIG_REG);
-       if (devpriv) {
-               if (devpriv->dma)
-                       free_dma(devpriv->dma);
-               kfree(devpriv->dma_buffer);
-       }
+       a2150_free_dma(dev);
        comedi_legacy_detach(dev);
 };