diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-12 10:56:14 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-17 14:25:22 -0800 |
| commit | 742c4a095973f696cc9337e8ae39c3c4a834f7db (patch) | |
| tree | 62cd4c3e0ed5a6b08e569dd51b80d410517fa672 /drivers | |
| parent | 7447cd60a3700aa915b45e18afddd338eaaec117 (diff) | |
staging: comedi: das16: introduce das16_free_dma()
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/das16.c | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 0f4a58785477..e0b41ae2cc36 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -1028,6 +1028,24 @@ static int das16_alloc_dma(struct comedi_device *dev, unsigned int dma_chan) return 0; } +static void das16_free_dma(struct comedi_device *dev) +{ + struct das16_private_struct *devpriv = dev->private; + struct das16_dma_desc *dma; + int i; + + if (devpriv->timer.data) + del_timer_sync(&devpriv->timer); + for (i = 0; i < 2; i++) { + dma = &devpriv->dma_desc[i]; + if (dma->virt_addr) + pci_free_consistent(NULL, DAS16_DMA_SIZE, + dma->virt_addr, dma->hw_addr); + } + if (devpriv->dma_chan) + free_dma(devpriv->dma_chan); +} + static int das16_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct das16_board *board = dev->board_ptr; @@ -1226,24 +1244,11 @@ static void das16_detach(struct comedi_device *dev) { const struct das16_board *board = dev->board_ptr; struct das16_private_struct *devpriv = dev->private; - struct das16_dma_desc *dma; - int i; if (devpriv) { - if (devpriv->timer.data) - del_timer_sync(&devpriv->timer); if (dev->iobase) das16_reset(dev); - - for (i = 0; i < 2; i++) { - dma = &devpriv->dma_desc[i]; - if (dma->virt_addr) - pci_free_consistent(NULL, DAS16_DMA_SIZE, - dma->virt_addr, - dma->hw_addr); - } - if (devpriv->dma_chan) - free_dma(devpriv->dma_chan); + das16_free_dma(dev); kfree(devpriv->user_ai_range_table); kfree(devpriv->user_ao_range_table); |