Commit 99b21f22 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das1800: introduce das1800_free_dma() 



For aesthetics, introduce a helper function to free the DMA channels and
allocated buffers.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4b064ee

drivers/staging/comedi/drivers/das1800.c

+20 −10
Original line number Diff line number Diff line
@@ -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);