Skip to content

Commit

Permalink
staging: comedi: ii_pci20kc: iobase and ioaddr are void __iomem *
Browse files Browse the repository at this point in the history
The iobase variables in struct pci20xxx_subdev_private and ioaddr
variable in struct pci20xxx_private should be void __iomem * not
void *.

This quiets a lot of sparse warings for the writeb and readb 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 86a5eb8 commit 4aa7419
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/staging/comedi/drivers/ii_pci20kc.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ options for PCI-20341M:
#define PCI20341_SCANLIST 0x80 /* Channel/Gain Scan List */

union pci20xxx_subdev_private {
void *iobase;
void __iomem *iobase;
struct {
void *iobase;
void __iomem *iobase;
const struct comedi_lrange *ao_range_list[2];
/* range of channels of ao module */
unsigned int last_data[2];
} pci20006;
struct {
void *iobase;
void __iomem *iobase;
int timebase;
int settling_time;
int ai_gain;
Expand All @@ -152,7 +152,7 @@ union pci20xxx_subdev_private {

struct pci20xxx_private {

void *ioaddr;
void __iomem *ioaddr;
union pci20xxx_subdev_private subdev_private[PCI20000_MODULES];
};

Expand Down Expand Up @@ -210,7 +210,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
if (ret < 0)
return ret;

devpriv->ioaddr = (void *)(unsigned long)it->options[0];
devpriv->ioaddr = (void __iomem *)(unsigned long)it->options[0];
dev->board_name = "pci20kc";

/* Check PCI-20001 C-2A Carrier Board ID */
Expand Down

0 comments on commit 4aa7419

Please sign in to comment.