staging: comedi: gsc_hpdi: plx9080_iobase and hpdi_iobase are void __iomem *
PATCH 1/1 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 <[email protected]>
Cc Ian Abbott <[email protected]>
Cc Mori Hess <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/gsc_hpdi.c +6 -6
@@ -297,8 +297,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 ];
@@ -364,7 +364,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",
@@ -673,10 +673,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])
@@ -903,7 +903,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 =