pcmcia: replace kio_addr_t with unsigned int everywhere
Remove kio_addr_t, and replace it with unsigned int. No known architecture needs more than 32 bits for IO addresses and ports and having a separate type for it is just messy. Signed-off-by: Olof Johansson <olof@lixom.net> Cc: Christoph Hellwig <hch@lst.de> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
ecb8a8472f
commit
906da809c5
@@ -58,7 +58,7 @@ typedef struct pcc_socket {
|
||||
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_irq1, cs_irq2, intr;
|
||||
@@ -298,7 +298,8 @@ static int __init is_alive(u_short sock)
|
||||
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];
|
||||
|
||||
@@ -738,7 +739,7 @@ static int __init init_m32r_pcc(void)
|
||||
#else /* CONFIG_PLAT_USRV */
|
||||
{
|
||||
ulong base, mapaddr;
|
||||
kio_addr_t ioaddr;
|
||||
unsigned int ioaddr;
|
||||
|
||||
for (i = 0 ; i < M32R_MAX_PCC ; i++) {
|
||||
base = (ulong)PLD_CFRSTCR;
|
||||
|
Reference in New Issue
Block a user