Skip to content

Commit

Permalink
staging: comedi: gsc_hpdi: plx9080_iobase and hpdi_iobase are void __…
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent 85a15d5 commit ff45031
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/staging/comedi/drivers/gsc_hpdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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])
Expand Down Expand Up @@ -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 =
Expand Down

0 comments on commit ff45031

Please sign in to comment.