diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-27 19:05:34 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-29 03:43:14 -0400 |
commit | d39bd56452b509f8d6054883b8a0129950ba50cc (patch) | |
tree | a73caaee8d691d43bfc23cb21e8c33edf31c4205 /drivers/pcmcia | |
parent | a58357862e71919555ea96cd272e535593a8b3da (diff) |
pcmcia: encapsulate ioaddr_t
By now, ioaddr_t should only be used by the deprecated ioctl, as it does not
correctly reflect the maximum ioport range at least on some architectures.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/au1000_generic.c | 2 | ||||
-rw-r--r-- | drivers/pcmcia/au1000_generic.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index 75e8f8505e47..fc1de46fd20a 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c | |||
@@ -292,7 +292,7 @@ au1x00_pcmcia_set_io_map(struct pcmcia_socket *sock, struct pccard_io_map *map) | |||
292 | skt->spd_io[map->map] = speed; | 292 | skt->spd_io[map->map] = speed; |
293 | } | 293 | } |
294 | 294 | ||
295 | map->start=(ioaddr_t)(u32)skt->virt_io; | 295 | map->start=(unsigned int)(u32)skt->virt_io; |
296 | map->stop=map->start+MAP_SIZE; | 296 | map->stop=map->start+MAP_SIZE; |
297 | return 0; | 297 | return 0; |
298 | 298 | ||
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h index a53ef5902518..13a4fbc58711 100644 --- a/drivers/pcmcia/au1000_generic.h +++ b/drivers/pcmcia/au1000_generic.h | |||
@@ -116,7 +116,7 @@ struct au1000_pcmcia_socket { | |||
116 | struct resource res_attr; | 116 | struct resource res_attr; |
117 | 117 | ||
118 | void * virt_io; | 118 | void * virt_io; |
119 | ioaddr_t phys_io; | 119 | unsigned int phys_io; |
120 | unsigned int phys_attr; | 120 | unsigned int phys_attr; |
121 | unsigned int phys_mem; | 121 | unsigned int phys_mem; |
122 | unsigned short speed_io, speed_attr, speed_mem; | 122 | unsigned short speed_io, speed_attr, speed_mem; |