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

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

staging: comedi: pcl816: introduce pcl816_free_dma() 



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 1fa51639

drivers/staging/comedi/drivers/pcl816.c

+17 −8
Original line number Diff line number Diff line
@@ -704,6 +704,22 @@ static int pcl816_alloc_dma(struct comedi_device *dev, 
	return 0;

}



static void pcl816_free_dma(struct comedi_device *dev)

{

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

{

	const struct pcl816_board *board = dev->board_ptr;
@@ -785,18 +801,11 @@ static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it) 


static void pcl816_detach(struct comedi_device *dev)

{

	struct pcl816_private *devpriv = dev->private;



	if (dev->private) {

		pcl816_ai_cancel(dev, dev->read_subdev);

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

	}

	pcl816_free_dma(dev);

	comedi_legacy_detach(dev);

}