leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: ii_pci20kc: iobase and ioaddr are void __iomem *

Browse Source 
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>
This commit is contained in:
H Hartley Sweeten 2012-05-21 18:10:07 -07:00 committed by Greg Kroah-Hartman
parent 86a5eb8cce
commit 4aa7419e08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/ii_pci20kc.c
View File

@ -135,15 +135,15 @@ options for PCI-20341M:
#define PCI20341_SCANLIST 0x80 /* Channel/Gain Scan List */ #define PCI20341_SCANLIST 0x80 /* Channel/Gain Scan List */
union pci20xxx_subdev_private { union pci20xxx_subdev_private {
void *iobase; void __iomem *iobase;
struct { struct {
void *iobase; void __iomem *iobase;
const struct comedi_lrange *ao_range_list[2]; const struct comedi_lrange *ao_range_list[2];
/* range of channels of ao module */ /* range of channels of ao module */
unsigned int last_data[2]; unsigned int last_data[2];
} pci20006; } pci20006;
struct { struct {
void *iobase; void __iomem *iobase;
int timebase; int timebase;
int settling_time; int settling_time;
int ai_gain; int ai_gain;
@ -152,7 +152,7 @@ union pci20xxx_subdev_private {
struct pci20xxx_private { struct pci20xxx_private {
void *ioaddr; void __iomem *ioaddr;
union pci20xxx_subdev_private subdev_private[PCI20000_MODULES]; union pci20xxx_subdev_private subdev_private[PCI20000_MODULES];
}; };
@ -210,7 +210,7 @@ static int pci20xxx_attach(struct comedi_device *dev,
if (ret < 0) if (ret < 0)
return ret; return ret;
devpriv->ioaddr = (void *)(unsigned long)it->options[0]; devpriv->ioaddr = (void __iomem *)(unsigned long)it->options[0];
dev->board_name = "pci20kc"; dev->board_name = "pci20kc";
/* Check PCI-20001 C-2A Carrier Board ID */ /* Check PCI-20001 C-2A Carrier Board ID */