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

staging: comedi: gsc_hpdi: plx9080_iobase and hpdi_iobase are void __iomem *

The plx9080_iobase and hpdi_iobase variables in struct hpdi_private
are ioremap'ed pci resource and should be void __iomem * not void *.

This quiets a lot of sparse warings for the writel and readl calls
like:

warning: incorrect type in argument 1 (different address spaces)
   expected void const volatile [noderef] <asn:2>*addr
   got void *<noident>

warning: incorrect type in argument 2 (different address spaces)
   expected void volatile [noderef] <asn:2>*addr
   got void *
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 85a15d5b
...@@ -296,8 +296,8 @@ struct hpdi_private { ...@@ -296,8 +296,8 @@ struct hpdi_private {
resource_size_t plx9080_phys_iobase; resource_size_t plx9080_phys_iobase;
resource_size_t hpdi_phys_iobase; resource_size_t hpdi_phys_iobase;
/* base addresses (ioremapped) */ /* base addresses (ioremapped) */
void *plx9080_iobase; void __iomem *plx9080_iobase;
void *hpdi_iobase; void __iomem *hpdi_iobase;
uint32_t *dio_buffer[NUM_DMA_BUFFERS]; /* dma buffers */ uint32_t *dio_buffer[NUM_DMA_BUFFERS]; /* dma buffers */
/* physical addresses of dma buffers */ /* physical addresses of dma buffers */
dma_addr_t dio_buffer_phys_addr[NUM_DMA_BUFFERS]; dma_addr_t dio_buffer_phys_addr[NUM_DMA_BUFFERS];
...@@ -363,7 +363,7 @@ static void disable_plx_interrupts(struct comedi_device *dev) ...@@ -363,7 +363,7 @@ static void disable_plx_interrupts(struct comedi_device *dev)
static void init_plx9080(struct comedi_device *dev) static void init_plx9080(struct comedi_device *dev)
{ {
uint32_t bits; uint32_t bits;
void *plx_iobase = priv(dev)->plx9080_iobase; void __iomem *plx_iobase = priv(dev)->plx9080_iobase;
/* plx9080 dump */ /* plx9080 dump */
DEBUG_PRINT(" plx interrupt status 0x%x\n", DEBUG_PRINT(" plx interrupt status 0x%x\n",
...@@ -672,10 +672,10 @@ static void hpdi_detach(struct comedi_device *dev) ...@@ -672,10 +672,10 @@ static void hpdi_detach(struct comedi_device *dev)
if ((priv(dev)) && (priv(dev)->hw_dev)) { if ((priv(dev)) && (priv(dev)->hw_dev)) {
if (priv(dev)->plx9080_iobase) { if (priv(dev)->plx9080_iobase) {
disable_plx_interrupts(dev); disable_plx_interrupts(dev);
iounmap((void *)priv(dev)->plx9080_iobase); iounmap(priv(dev)->plx9080_iobase);
} }
if (priv(dev)->hpdi_iobase) if (priv(dev)->hpdi_iobase)
iounmap((void *)priv(dev)->hpdi_iobase); iounmap(priv(dev)->hpdi_iobase);
/* free pci dma buffers */ /* free pci dma buffers */
for (i = 0; i < NUM_DMA_BUFFERS; i++) { for (i = 0; i < NUM_DMA_BUFFERS; i++) {
if (priv(dev)->dio_buffer[i]) if (priv(dev)->dio_buffer[i])
...@@ -902,7 +902,7 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel) ...@@ -902,7 +902,7 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
uint32_t next_transfer_addr; uint32_t next_transfer_addr;
int j; int j;
int num_samples = 0; int num_samples = 0;
void *pci_addr_reg; void __iomem *pci_addr_reg;
if (channel) if (channel)
pci_addr_reg = pci_addr_reg =
......
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