From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 9 Sep 2014 20:05:39 +0000 (-0700)
Subject: staging: comedi: adl_pci9118: change type of pci9118_dmabuf 'virt' member
X-Git-Tag: firefly_0821_release~176^2~3121^2~531
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e652632fc240f4ed40da60ec899cdcf3655afd37;p=firefly-linux-kernel-4.4.55.git

staging: comedi: adl_pci9118: change type of pci9118_dmabuf 'virt' member

For aesthetics, change the type of this member to avoid the casts when allocating
and freeing the DMA buffers. This does introduce a cast in move_block_from_dma()
but that cast is cleaner.

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/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index 7bfaac781ae2..3e3405ccdede 100644
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -205,7 +205,7 @@ static const struct pci9118_boardinfo pci9118_boards[] = {
 };
 
 struct pci9118_dmabuf {
-	unsigned short *virt;	/* virtual address of buffer */
+	unsigned long virt;	/* virtual address of buffer */
 	unsigned long hw;	/* hardware (bus) address of buffer */
 	unsigned int size;	/* size of dma buffer in bytes */
 	unsigned int use_size;	/* which size we may now use for transfer */
@@ -491,12 +491,13 @@ static unsigned int defragment_dma_buffer(struct comedi_device *dev,
 }
 
 static int move_block_from_dma(struct comedi_device *dev,
-					struct comedi_subdevice *s,
-					unsigned short *dma_buffer,
-					unsigned int num_samples)
+			       struct comedi_subdevice *s,
+			       unsigned long virt_addr,
+			       unsigned int num_samples)
 {
 	struct pci9118_private *devpriv = dev->private;
 	struct comedi_cmd *cmd = &s->async->cmd;
+	unsigned short *dma_buffer = (unsigned short *)virt_addr;
 	unsigned int num_bytes;
 
 	num_samples = defragment_dma_buffer(dev, s, dma_buffer, num_samples);
@@ -1616,8 +1617,7 @@ static void pci9118_alloc_dma(struct comedi_device *dev)
 	for (i = 0; i < 2; i++) {
 		dmabuf = &devpriv->dmabuf[i];
 		for (pages = 4; pages >= 0; pages--) {
-			dmabuf->virt = (unsigned short *)
-					__get_free_pages(GFP_KERNEL, pages);
+			dmabuf->virt = __get_free_pages(GFP_KERNEL, pages);
 			if (dmabuf->virt)
 				break;
 		}
@@ -1646,7 +1646,7 @@ static void pci9118_free_dma(struct comedi_device *dev)
 	for (i = 0; i < 2; i++) {
 		dmabuf = &devpriv->dmabuf[i];
 		if (dmabuf->virt)
-			free_pages((unsigned long)dmabuf->virt, dmabuf->pages);
+			free_pages(dmabuf->virt, dmabuf->pages);
 	}
 }