projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pcmcia: replace kio_addr_t with unsigned int everywhere
[powerpc.git]
/
drivers
/
pcmcia
/
m32r_pcc.c
diff --git
a/drivers/pcmcia/m32r_pcc.c
b/drivers/pcmcia/m32r_pcc.c
index
c5e0d89
..
2b42b71
100644
(file)
--- a/
drivers/pcmcia/m32r_pcc.c
+++ b/
drivers/pcmcia/m32r_pcc.c
@@
-65,7
+65,7
@@
typedef struct pcc_socket {
u_short type, flags;
struct pcmcia_socket socket;
unsigned int number;
u_short type, flags;
struct pcmcia_socket socket;
unsigned int number;
-
kio_addr_t
ioaddr;
+
unsigned int
ioaddr;
u_long mapaddr;
u_long base; /* PCC register base */
u_char cs_irq, intr;
u_long mapaddr;
u_long base; /* PCC register base */
u_char cs_irq, intr;
@@
-310,7
+310,8
@@
static int __init is_alive(u_short sock)
return 0;
}
return 0;
}
-static void add_pcc_socket(ulong base, int irq, ulong mapaddr, kio_addr_t ioaddr)
+static void add_pcc_socket(ulong base, int irq, ulong mapaddr,
+ unsigned int ioaddr)
{
pcc_socket_t *t = &socket[pcc_sockets];
{
pcc_socket_t *t = &socket[pcc_sockets];
@@
-368,7
+369,7
@@
static irqreturn_t pcc_interrupt(int irq, void *dev)
handled = 1;
irc = pcc_get(i, PCIRC);
irc >>=16;
handled = 1;
irc = pcc_get(i, PCIRC);
irc >>=16;
- debug(2, "m32r-pcc:interr
pu
t: socket %d pcirc 0x%02x ", i, irc);
+ debug(2, "m32r-pcc:interr
up
t: socket %d pcirc 0x%02x ", i, irc);
if (!irc)
continue;
if (!irc)
continue;
@@
-491,7
+492,7
@@
static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io)
u_char map;
debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
u_char map;
debug(3, "m32r-pcc: SetIOMap(%d, %d, %#2.2x, %d ns, "
- "%#
lx-%#l
x)\n", sock, io->map, io->flags,
+ "%#
x-%#
x)\n", sock, io->map, io->flags,
io->speed, io->start, io->stop);
map = io->map;
io->speed, io->start, io->stop);
map = io->map;