Commit f5d077cd authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: mite: rename 'struct mite_dma_descriptor'

Rename this struct to 'mite_dma_desc' to help shorten the long lines.
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 1a8da31b
...@@ -380,7 +380,7 @@ void mite_free_ring(struct mite_dma_descriptor_ring *ring) ...@@ -380,7 +380,7 @@ void mite_free_ring(struct mite_dma_descriptor_ring *ring)
if (ring->descriptors) { if (ring->descriptors) {
dma_free_coherent(ring->hw_dev, dma_free_coherent(ring->hw_dev,
ring->n_links * ring->n_links *
sizeof(struct mite_dma_descriptor), sizeof(struct mite_dma_desc),
ring->descriptors, ring->descriptors,
ring->descriptors_dma_addr); ring->descriptors_dma_addr);
} }
...@@ -477,7 +477,7 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring, ...@@ -477,7 +477,7 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring,
if (ring->descriptors) { if (ring->descriptors) {
dma_free_coherent(ring->hw_dev, dma_free_coherent(ring->hw_dev,
ring->n_links * ring->n_links *
sizeof(struct mite_dma_descriptor), sizeof(struct mite_dma_desc),
ring->descriptors, ring->descriptors,
ring->descriptors_dma_addr); ring->descriptors_dma_addr);
} }
...@@ -492,7 +492,7 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring, ...@@ -492,7 +492,7 @@ int mite_buf_change(struct mite_dma_descriptor_ring *ring,
ring->descriptors = ring->descriptors =
dma_alloc_coherent(ring->hw_dev, 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); &ring->descriptors_dma_addr, GFP_KERNEL);
if (!ring->descriptors) { if (!ring->descriptors) {
dev_err(s->device->class_dev, dev_err(s->device->class_dev,
...@@ -537,7 +537,7 @@ int mite_init_ring_descriptors(struct mite_dma_descriptor_ring *ring, ...@@ -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); cpu_to_le32(async->buf_map->page_list[i].dma_addr);
ring->descriptors[i].next = ring->descriptors[i].next =
cpu_to_le32(ring->descriptors_dma_addr + 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. */ /* the last link is either a remainder or was a full link. */
......
...@@ -28,7 +28,7 @@ struct comedi_subdevice; ...@@ -28,7 +28,7 @@ struct comedi_subdevice;
struct device; struct device;
struct pci_dev; struct pci_dev;
struct mite_dma_descriptor { struct mite_dma_desc {
__le32 count; __le32 count;
__le32 addr; __le32 addr;
__le32 next; __le32 next;
...@@ -38,7 +38,7 @@ struct mite_dma_descriptor { ...@@ -38,7 +38,7 @@ struct mite_dma_descriptor {
struct mite_dma_descriptor_ring { struct mite_dma_descriptor_ring {
struct device *hw_dev; struct device *hw_dev;
unsigned int n_links; unsigned int n_links;
struct mite_dma_descriptor *descriptors; struct mite_dma_desc *descriptors;
dma_addr_t descriptors_dma_addr; dma_addr_t descriptors_dma_addr;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment