git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcmcia: convert some internal-only ioaddr_t to unsigned int
[safe/jmp/linux-2.6]
/
drivers
/
pcmcia
/
pcmcia_resource.c
diff --git
a/drivers/pcmcia/pcmcia_resource.c
b/drivers/pcmcia/pcmcia_resource.c
index
0ce39de
..
1d128fb
100644
(file)
--- a/
drivers/pcmcia/pcmcia_resource.c
+++ b/
drivers/pcmcia/pcmcia_resource.c
@@
-65,23
+65,23
@@
extern int ds_pc_debug;
* Special stuff for managing IO windows, because they are scarce
*/
* Special stuff for managing IO windows, because they are scarce
*/
-static int alloc_io_space(struct pcmcia_socket *s, u_int attr,
ioaddr_t *base,
-
ioaddr_
t num, u_int lines)
+static int alloc_io_space(struct pcmcia_socket *s, u_int attr,
+
unsigned int *base, unsigned in
t num, u_int lines)
{
int i;
{
int i;
-
kio_addr_
t try, align;
+
unsigned in
t try, align;
align = (*base) ? (lines ? 1<<lines : 0) : 1;
if (align && (align < num)) {
if (*base) {
align = (*base) ? (lines ? 1<<lines : 0) : 1;
if (align && (align < num)) {
if (*base) {
- ds_dbg(s, 0, "odd IO request: num %#x align %#
l
x\n",
+ ds_dbg(s, 0, "odd IO request: num %#x align %#x\n",
num, align);
align = 0;
} else
while (align && (align < num)) align <<= 1;
}
if (*base & ~(align-1)) {
num, align);
align = 0;
} else
while (align && (align < num)) align <<= 1;
}
if (*base & ~(align-1)) {
- ds_dbg(s, 0, "odd IO request: base %#x align %#
l
x\n",
+ ds_dbg(s, 0, "odd IO request: base %#x align %#x\n",
*base, align);
align = 0;
}
*base, align);
align = 0;
}
@@
-132,8
+132,8
@@
static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base,
} /* alloc_io_space */
} /* alloc_io_space */
-static void release_io_space(struct pcmcia_socket *s,
ioaddr_
t base,
-
ioaddr_
t num)
+static void release_io_space(struct pcmcia_socket *s,
unsigned in
t base,
+
unsigned in
t num)
{
int i;
{
int i;