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: H 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 79e22b13f734d66afb7586a3e9de1dec49022e2d..eeb05553e1a79646bb7ed6a11e8de2380687ff2b 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -296,8 +296,8 @@ struct hpdi_private {
        resource_size_t plx9080_phys_iobase;
        resource_size_t hpdi_phys_iobase;
        /*  base addresses (ioremapped) */
-       void *plx9080_iobase;
-       void *hpdi_iobase;
+       void __iomem *plx9080_iobase;
+       void __iomem *hpdi_iobase;
        uint32_t *dio_buffer[NUM_DMA_BUFFERS];  /*  dma buffers */
        /* physical addresses of 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)
 static void init_plx9080(struct comedi_device *dev)
 {
        uint32_t bits;
-       void *plx_iobase = priv(dev)->plx9080_iobase;
+       void __iomem *plx_iobase = priv(dev)->plx9080_iobase;
 
        /*  plx9080 dump */
        DEBUG_PRINT(" plx interrupt status 0x%x\n",
@@ -672,10 +672,10 @@ static void hpdi_detach(struct comedi_device *dev)
        if ((priv(dev)) && (priv(dev)->hw_dev)) {
                if (priv(dev)->plx9080_iobase) {
                        disable_plx_interrupts(dev);
-                       iounmap((void *)priv(dev)->plx9080_iobase);
+                       iounmap(priv(dev)->plx9080_iobase);
                }
                if (priv(dev)->hpdi_iobase)
-                       iounmap((void *)priv(dev)->hpdi_iobase);
+                       iounmap(priv(dev)->hpdi_iobase);
                /*  free pci dma buffers */
                for (i = 0; i < NUM_DMA_BUFFERS; i++) {
                        if (priv(dev)->dio_buffer[i])
@@ -902,7 +902,7 @@ static void drain_dma_buffers(struct comedi_device *dev, unsigned int channel)
        uint32_t next_transfer_addr;
        int j;
        int num_samples = 0;
-       void *pci_addr_reg;
+       void __iomem *pci_addr_reg;
 
        if (channel)
                pci_addr_reg =