diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-12 10:55:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-17 14:25:19 -0800 |
| commit | 99b21f22d2b6708bfe06507d5f8a6955766f8b27 (patch) | |
| tree | b91cf6fd4a8e955b50e4539c264236a4b773ccc0 | |
| parent | a4b064ee4675686dfe31fcc54c3ec188141f6ee2 (diff) | |
staging: comedi: das1800: introduce das1800_free_dma()
For aesthetics, introduce a helper function to free the DMA channels and
allocated buffers.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/das1800.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index dd46a919904a..1eb5eab52007 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c @@ -1303,6 +1303,25 @@ static int das1800_init_dma(struct comedi_device *dev, return 0; } +static void das1800_free_dma(struct comedi_device *dev) +{ + struct das1800_private *devpriv = dev->private; + struct das1800_dma_desc *dma; + int i; + + if (!devpriv) + return; + + for (i = 0; i < 2; i++) { + dma = &devpriv->dma_desc[i]; + if (dma->chan) + free_dma(dma->chan); + if (dma->virt_addr) + dma_free_coherent(NULL, DMA_BUF_SIZE, + dma->virt_addr, dma->hw_addr); + } +} + static int das1800_probe(struct comedi_device *dev) { const struct das1800_board *board = dev->board_ptr; @@ -1514,18 +1533,9 @@ static int das1800_attach(struct comedi_device *dev, static void das1800_detach(struct comedi_device *dev) { struct das1800_private *devpriv = dev->private; - struct das1800_dma_desc *dma; - int i; + das1800_free_dma(dev); if (devpriv) { - for (i = 0; i < 2; i++) { - dma = &devpriv->dma_desc[i]; - if (dma->chan) - free_dma(dma->chan); - if (dma->virt_addr) - dma_free_coherent(NULL, DMA_BUF_SIZE, - dma->virt_addr, dma->hw_addr); - } kfree(devpriv->fifo_buf); if (devpriv->iobase2) release_region(devpriv->iobase2, DAS1800_SIZE); |