Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: comedi: pcl818: introduce pcl818_dma_free() 



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

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 655cd940

drivers/staging/comedi/drivers/pcl818.c

+17 −6
Original line number Diff line number Diff line
@@ -1082,6 +1082,22 @@ static int pcl818_alloc_dma(struct comedi_device *dev, unsigned int dma_chan) 
	return 0;

}



static void pcl818_free_dma(struct comedi_device *dev)

{

	struct pcl818_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 pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

	const struct pcl818_board *board = dev->board_ptr;
@@ -1217,13 +1233,8 @@ static void pcl818_detach(struct comedi_device *dev) 
	if (devpriv) {

		pcl818_ai_cancel(dev, dev->read_subdev);

		pcl818_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);

	}

	pcl818_free_dma(dev);

	comedi_legacy_detach(dev);

}