From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 2 May 2016 17:11:42 +0000 (-0700)
Subject: staging: comedi: mite: introduce mite_free_dma_descs()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9ec148da5fcb04456e883cb243fa1e872d47d385;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

staging: comedi: mite: introduce mite_free_dma_descs()

Introduce a helper function to handle the dma_free_coherent() of
the mite dma descriptors.

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

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index 14b5345a9357..8b0f875972f5 100644
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -371,16 +371,24 @@ struct mite_ring *mite_alloc_ring(struct mite *mite)
 };
 EXPORT_SYMBOL_GPL(mite_alloc_ring);
 
+static void mite_free_dma_descs(struct mite_ring *ring)
+{
+	struct mite_dma_desc *descs = ring->descs;
+
+	if (descs) {
+		dma_free_coherent(ring->hw_dev,
+				  ring->n_links * sizeof(*descs),
+				  descs, ring->dma_addr);
+		ring->descs = NULL;
+		ring->dma_addr = 0;
+		ring->n_links = 0;
+	}
+}
+
 void mite_free_ring(struct mite_ring *ring)
 {
 	if (ring) {
-		if (ring->descs) {
-			dma_free_coherent(ring->hw_dev,
-					  ring->n_links *
-					  sizeof(struct mite_dma_desc),
-					  ring->descs,
-					  ring->dma_addr);
-		}
+		mite_free_dma_descs(ring);
 		put_device(ring->hw_dev);
 		kfree(ring);
 	}
@@ -467,16 +475,7 @@ int mite_buf_change(struct mite_ring *ring,
 	struct comedi_async *async = s->async;
 	unsigned int n_links;
 
-	if (ring->descs) {
-		dma_free_coherent(ring->hw_dev,
-				  ring->n_links *
-				  sizeof(struct mite_dma_desc),
-				  ring->descs,
-				  ring->dma_addr);
-	}
-	ring->descs = NULL;
-	ring->dma_addr = 0;
-	ring->n_links = 0;
+	mite_free_dma_descs(ring);
 
 	if (async->prealloc_bufsz == 0)
 		return 0;