diff options
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 0ce39de834c4..1d128fbd1a92 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -65,23 +65,23 @@ extern int ds_pc_debug; | |||
65 | * Special stuff for managing IO windows, because they are scarce | 65 | * Special stuff for managing IO windows, because they are scarce |
66 | */ | 66 | */ |
67 | 67 | ||
68 | static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base, | 68 | static int alloc_io_space(struct pcmcia_socket *s, u_int attr, |
69 | ioaddr_t num, u_int lines) | 69 | unsigned int *base, unsigned int num, u_int lines) |
70 | { | 70 | { |
71 | int i; | 71 | int i; |
72 | kio_addr_t try, align; | 72 | unsigned int try, align; |
73 | 73 | ||
74 | align = (*base) ? (lines ? 1<<lines : 0) : 1; | 74 | align = (*base) ? (lines ? 1<<lines : 0) : 1; |
75 | if (align && (align < num)) { | 75 | if (align && (align < num)) { |
76 | if (*base) { | 76 | if (*base) { |
77 | ds_dbg(s, 0, "odd IO request: num %#x align %#lx\n", | 77 | ds_dbg(s, 0, "odd IO request: num %#x align %#x\n", |
78 | num, align); | 78 | num, align); |
79 | align = 0; | 79 | align = 0; |
80 | } else | 80 | } else |
81 | while (align && (align < num)) align <<= 1; | 81 | while (align && (align < num)) align <<= 1; |
82 | } | 82 | } |
83 | if (*base & ~(align-1)) { | 83 | if (*base & ~(align-1)) { |
84 | ds_dbg(s, 0, "odd IO request: base %#x align %#lx\n", | 84 | ds_dbg(s, 0, "odd IO request: base %#x align %#x\n", |
85 | *base, align); | 85 | *base, align); |
86 | align = 0; | 86 | align = 0; |
87 | } | 87 | } |
@@ -132,8 +132,8 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr, ioaddr_t *base, | |||
132 | } /* alloc_io_space */ | 132 | } /* alloc_io_space */ |
133 | 133 | ||
134 | 134 | ||
135 | static void release_io_space(struct pcmcia_socket *s, ioaddr_t base, | 135 | static void release_io_space(struct pcmcia_socket *s, unsigned int base, |
136 | ioaddr_t num) | 136 | unsigned int num) |
137 | { | 137 | { |
138 | int i; | 138 | int i; |
139 | 139 | ||