From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Mon, 2 May 2016 17:11:35 +0000 (-0700)
Subject: staging: comedi: mite: rename 'struct mite_dma_descriptor'
X-Git-Tag: v4.7-rc1~90^2~64
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f5d077cd207155b3bbd66e7765d24732591a392b;p=linux.git

staging: comedi: mite: rename 'struct mite_dma_descriptor'

Rename this struct to 'mite_dma_desc' to help shorten the long lines.

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 4bfdbf03eece..127a86e651b8 100644
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -380,7 +380,7 @@ void mite_free_ring(struct mite_dma_descriptor_ring *ring)
 		if (ring->descriptors) {
 			dma_free_coherent(ring->hw_dev,
 					  ring->n_links *
-					  sizeof(struct mite_dma_descriptor),
+					  sizeof(struct mite_dma_desc),
 					  ring->descriptors,
 					  ring->descriptors_dma_addr);
 		}
@@ -477,7 +477,7 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring,
 	if (ring->descriptors) {
 		dma_free_coherent(ring->hw_dev,
 				  ring->n_links *
-				  sizeof(struct mite_dma_descriptor),
+				  sizeof(struct mite_dma_desc),
 				  ring->descriptors,
 				  ring->descriptors_dma_addr);
 	}
@@ -492,7 +492,7 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring,
 
 	ring->descriptors =
 	    dma_alloc_coherent(ring->hw_dev,
-			       n_links * sizeof(struct mite_dma_descriptor),
+			       n_links * sizeof(struct mite_dma_desc),
 			       &ring->descriptors_dma_addr, GFP_KERNEL);
 	if (!ring->descriptors) {
 		dev_err(s->device->class_dev,
@@ -537,7 +537,7 @@ int mite_init_ring_descriptors(struct mite_dma_descriptor_ring *ring,
 		    cpu_to_le32(async->buf_map->page_list[i].dma_addr);
 		ring->descriptors[i].next =
 		    cpu_to_le32(ring->descriptors_dma_addr +
-				(i + 1) * sizeof(struct mite_dma_descriptor));
+				(i + 1) * sizeof(struct mite_dma_desc));
 	}
 
 	/* the last link is either a remainder or was a full link. */
diff --git a/drivers/staging/comedi/drivers/mite.h b/drivers/staging/comedi/drivers/mite.h
index 93d6a3202417..c42438fbae32 100644
--- a/drivers/staging/comedi/drivers/mite.h
+++ b/drivers/staging/comedi/drivers/mite.h
@@ -28,7 +28,7 @@ struct comedi_subdevice;
 struct device;
 struct pci_dev;
 
-struct mite_dma_descriptor {
+struct mite_dma_desc {
 	__le32 count;
 	__le32 addr;
 	__le32 next;
@@ -38,7 +38,7 @@ struct mite_dma_descriptor {
 struct mite_dma_descriptor_ring {
 	struct device *hw_dev;
 	unsigned int n_links;
-	struct mite_dma_descriptor *descriptors;
+	struct mite_dma_desc *descriptors;
 	dma_addr_t descriptors_dma_addr;
 };